diff options
Diffstat (limited to 'app-admin')
328 files changed, 5380 insertions, 4881 deletions
diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest index 70c769b44350..b846e47c87af 100644 --- a/app-admin/analog/Manifest +++ b/app-admin/analog/Manifest @@ -1 +1,2 @@ +DIST analog-6.0.17.tar.gz 1593749 BLAKE2B 88a36128e9965ff99131c73025652be5585a77a5400df61526832e52c9faa6d81d89b16646678fee11680f4268380c54988186c7d82db3db66ded3530008551d SHA512 d4e324d4297069765896b877ce3190370ce85b6f06fd164887652aea1862cc8c3f40eb15b0964bc4435481b9ec61d50dd49961e1e75346414daf5dc979bddf32 DIST analog-src-6013ce.zip 4875246 BLAKE2B 6b0663f3367faf84a8c65a778a065165ddfba6cd902e5cc6c9e0e84d94e1600629b9f9f89b87ec293f4b81f4034e21941ad45784ae5f35352f71f7b0917eb731 SHA512 8f8dbf0bd95873132414f558deeff61fbe9ac6cac40936f00515ccaead86642613c3f0a5a88046eb4d1f4e263cb01d638291c9a1596ea36098b455572b7364ed diff --git a/app-admin/analog/analog-6.0.17.ebuild b/app-admin/analog/analog-6.0.17.ebuild new file mode 100644 index 000000000000..183e69685337 --- /dev/null +++ b/app-admin/analog/analog-6.0.17.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Multi-purpose, multi-platform log file analyser" +HOMEPAGE=" + https://www.c-amie.co.uk/software/analog/ + https://github.com/c-amie/analog-ce" +SRC_URI="https://github.com/c-amie/${PN}-ce/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-ce-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" + +DEPEND=" + >=dev-libs/libpcre-3.4 + >=media-libs/gd-1.8.4-r2[jpeg,png] + sys-libs/zlib" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-5.1-gentoo.diff + "${FILESDIR}"/${PN}-6.0-bzip2.patch + "${FILESDIR}"/${PN}-6.0-undefined-macro.patch +) + +src_prepare() { + default + sed -i src/Makefile \ + -e 's| -o | $(LDFLAGS)&|g' \ + || die "sed Makefile" +} + +src_compile() { + tc-export CC + # emake in main dir just executes "cd src && make", + # i.e. MAKEOPTS are ignored + emake -C src +} + +src_install() { + newman analog.man analog.1 + + dodoc README.txt Licence.txt ${PN}.cfg-sample + dodoc -r examples + docinto html + dodoc docs/*.{html,gif,css,ico} + dodoc -r how-to + docinto cgi + dodoc anlgform.pl + + insinto /usr/share/analog/images ; doins images/* + insinto /usr/share/analog/lang ; doins lang/* + dodir /var/log/analog + dosym ../../../usr/share/analog/images /var/log/analog/images + insinto /etc/analog ; doins "${FILESDIR}/analog.cfg" + dobin analog +} diff --git a/app-admin/analog/metadata.xml b/app-admin/analog/metadata.xml index 85e4ed814fa2..ecc93bc3122d 100644 --- a/app-admin/analog/metadata.xml +++ b/app-admin/analog/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> +<upstream> + <remote-id type="github">c-amie/analog-ce</remote-id> +</upstream> </pkgmetadata> diff --git a/app-admin/ananicy/ananicy-2.2.1-r1.ebuild b/app-admin/ananicy/ananicy-2.2.1-r1.ebuild index cec32d45eaef..f3f8a39a1804 100644 --- a/app-admin/ananicy/ananicy-2.2.1-r1.ebuild +++ b/app-admin/ananicy/ananicy-2.2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ S="${WORKDIR}/${P^}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64" +KEYWORDS="amd64 ~arm ~arm64" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} diff --git a/app-admin/ananicy/metadata.xml b/app-admin/ananicy/metadata.xml index cb2e8d8db595..88aaec308a1f 100644 --- a/app-admin/ananicy/metadata.xml +++ b/app-admin/ananicy/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>lssndrbarbieri@gmail.com</email> - <name>Alessandro Barbieri</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <bugs-to>https://github.com/Nefelim4ag/Ananicy/issues</bugs-to> <remote-id type="github">Nefelim4ag/Ananicy</remote-id> diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest index 7c9344fb0d26..bfc3fb4d4c1d 100644 --- a/app-admin/ansible-core/Manifest +++ b/app-admin/ansible-core/Manifest @@ -1,4 +1,4 @@ DIST ansible-core-2.14.13.tar.gz 3145413 BLAKE2B 75b11feaaefa9a63c6f83f64c796ceacf7c6b08322ac0b85f6dcf968db7b80cc97262ea6f8f839e5e41e800ad7cae610e96f312c1ae0f58882c8891246a81b8a SHA512 195885815d40448d8497eae9533a4104c4b9f17ab3a812d544a403f41d2e77e7be2c15bae5a6df07563499052beb273580a569d51b667d0a9c5a16e55b35258a DIST ansible-core-2.15.8.tar.gz 3160606 BLAKE2B 439a3f584940e5ab46b43b0b47395e0618a3ea52c67ebcd51667f31220cb038dda35506e7843d177d555b77a55a9d2c6245a916741ab1dcdf222c535afb5f83d SHA512 020191ef4b005abbf799204da68270bd4f13a85c7f23cb9dffe85b1c5c093c0ad86e061211ab9fcc8fd0be9367717fb0baadefb1ebecd3579471120fb2e8647f -DIST ansible-core-2.16.2.tar.gz 3163899 BLAKE2B 6365dd573ae4a2f3ebfc870ae3ea399b268615333de2ddf7e21323189dfdd9bf61ae836b536c86d713f4a934468ed36835084e06e4b6d9b32c4b633f55353ad9 SHA512 6e2389fc6b34645c0f1566eca960da36616619a5ed5e35b46f3d659979fe519db20d89b4f598344a389f4b6ac33bb660ea91a1a6509002bbf4ac791ea3cb4cbd -DIST ansible-core-2.16.4.tar.gz 3170397 BLAKE2B 8226641621ce4b2a8cd564f831cd21e36345b2db6680f8d9f3d3388a05ff66df74f4d286300dbb1b73601a0bf4a781d266e62e9fd0c894a79f89d545930c854a SHA512 d05737eec9a6a0e71891821acd4540576b3a993f59d88c12c2da8e7f075bc11c712e0eba850b3f7a2643e3c970f51938267fed6fa7f99f2c4c205b64f9b13259 +DIST ansible_core-2.16.6.tar.gz 3176041 BLAKE2B 37aa15e8d9165eb89db0704f7670f78f3e3a50915e17bb1d56689e65e6cfc0bb15b7e01768d25c5d2a9a00802411a6eefdb9ad70aa38877d7115bc40faafea59 SHA512 cd9cc8783e13b073cbfaef889e20c8a7dfb732c91de4bae2b496a64ef47b0325c637b4ab2eadbd0c56cb004e95f5294aa1e1548675a90f06193d62defd553409 +DIST ansible_core-2.17.2.tar.gz 3125313 BLAKE2B 383e3bba117831053c8147c9aca15ee6768506a90be29b784a7232061179b514aa1287a9131b6bc471167e4e5720d2f189fa5e23a3df13c634ba8b030a68e51f SHA512 34c0630798d2c4ae4e426a7feb29f7d88738fa89df2abd36b825cbf010709c5c3ba4feaa5590d2841535d2b367d04dce9a817e9076cec791c7e9fcb47853249f diff --git a/app-admin/ansible-core/ansible-core-2.14.13.ebuild b/app-admin/ansible-core/ansible-core-2.14.13-r1.ebuild index 756b42643396..113c9aeb164f 100644 --- a/app-admin/ansible-core/ansible-core-2.14.13.ebuild +++ b/app-admin/ansible-core/ansible-core-2.14.13-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_USE_SETUPTOOLS=bdepend +DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 inherit distutils-r1 diff --git a/app-admin/ansible-core/ansible-core-2.15.8.ebuild b/app-admin/ansible-core/ansible-core-2.15.8-r1.ebuild index 3013d29fa0b5..45fc573d4107 100644 --- a/app-admin/ansible-core/ansible-core-2.15.8.ebuild +++ b/app-admin/ansible-core/ansible-core-2.15.8-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_USE_SETUPTOOLS=bdepend +DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 inherit distutils-r1 diff --git a/app-admin/ansible-core/ansible-core-2.16.4.ebuild b/app-admin/ansible-core/ansible-core-2.16.6.ebuild index 49da7dc95856..7e0388815e05 100644 --- a/app-admin/ansible-core/ansible-core-2.16.4.ebuild +++ b/app-admin/ansible-core/ansible-core-2.16.6.ebuild @@ -4,8 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_SETUPTOOLS=bdepend -PYPI_NO_NORMALIZE=1 +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 diff --git a/app-admin/ansible-core/ansible-core-2.16.2.ebuild b/app-admin/ansible-core/ansible-core-2.17.2.ebuild index 3013d29fa0b5..786e98e24c1d 100644 --- a/app-admin/ansible-core/ansible-core-2.16.2.ebuild +++ b/app-admin/ansible-core/ansible-core-2.17.2.ebuild @@ -3,9 +3,8 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_USE_SETUPTOOLS=bdepend -PYPI_NO_NORMALIZE=1 +PYTHON_COMPAT=( python3_{11..12} ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 @@ -18,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_BRANCH="devel" else inherit pypi - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" fi LICENSE="GPL-3" diff --git a/app-admin/ansible-core/ansible-core-9999.ebuild b/app-admin/ansible-core/ansible-core-9999.ebuild index 17a70128adeb..786e98e24c1d 100644 --- a/app-admin/ansible-core/ansible-core-9999.ebuild +++ b/app-admin/ansible-core/ansible-core-9999.ebuild @@ -3,9 +3,8 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_SETUPTOOLS=bdepend -PYPI_NO_NORMALIZE=1 +PYTHON_COMPAT=( python3_{11..12} ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 diff --git a/app-admin/ansible-core/metadata.xml b/app-admin/ansible-core/metadata.xml index 86dea112ad49..7e75c7575290 100644 --- a/app-admin/ansible-core/metadata.xml +++ b/app-admin/ansible-core/metadata.xml @@ -5,10 +5,6 @@ <email>prometheanfire@gentoo.org</email> <name>Matthew Thode</name> </maintainer> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> <upstream> <remote-id type="pypi">ansible-core</remote-id> <remote-id type="github">ansible/ansible</remote-id> diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest index 6a7b426a5e91..6d824b7aaf37 100644 --- a/app-admin/ansible-lint/Manifest +++ b/app-admin/ansible-lint/Manifest @@ -1,2 +1,2 @@ -DIST ansible-lint-24.2.0.tar.gz 513719 BLAKE2B 54e05acf982cf13cb2142a10bf04250171f07936df14933525dfae68b312a0d92ceb30867603dc7ce686206b7de010f6ca4eb9ab532ca000fc3c15c77c354c81 SHA512 3276d28c7b85a6087a0142cc56442efddf9ff3e81155455c74686015a2ab45ece64847b0243373ad01145e67599d8449866c122efe8ae404cd819011e41c5235 -DIST ansible-lint-6.22.2.tar.gz 513988 BLAKE2B b46764751a84ff2a699203bf07f4a04362faa99d7433af6ead9f7ada9e581ff8b3d9bbf205a0127950e15e4413a72fc057cd10588dffec2fb9621f58620ae1ca SHA512 b48dec138a37754135e48007636f020524947342ab40f2b9dea36e10989e88ee6899e4742f1715feecfd7e239c80d3bed0581558c39eac783a84523507740180 +DIST ansible-lint-24.2.2.tar.gz 515822 BLAKE2B e9d8e689dfe4e4efbd4dad44ff3567f50412400ed979f2d60150f09f17c5f63f2441f25a33ecdf0112024ced07e62ac16b8a2dbc1c01d62855ec785fc75d1b9a SHA512 3de6b14e4b64ba577abcb67920a45dbf45fedb84e21091cd6a29e3c52a7a91555a152ee3e265624aafbf9dddba96d04241c2598a18f2103ce2cae48706142446 +DIST ansible_lint-24.6.0.tar.gz 529088 BLAKE2B 3d307669d2035eb5a3a8295b40e3afca92ca4eae4ea419948fd2fa86127e05c60f3ca037a4b85b447320ba8a57f7e1a736a55d63aac80e386f9fc4d733190b09 SHA512 1eb8e3e1805ff98ae76ddcd873a5e90b0b0182fbbce3c40844b2a9069e6879fef906e14f98dd77e41372e461ea4350388b68e08be420afaf5d6c449a449a7989 diff --git a/app-admin/ansible-lint/ansible-lint-6.22.2.ebuild b/app-admin/ansible-lint/ansible-lint-24.2.2.ebuild index c509d62a76e4..1995f0728a37 100644 --- a/app-admin/ansible-lint/ansible-lint-6.22.2.ebuild +++ b/app-admin/ansible-lint/ansible-lint-24.2.2.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 pypi diff --git a/app-admin/ansible-lint/ansible-lint-24.2.0.ebuild b/app-admin/ansible-lint/ansible-lint-24.6.0.ebuild index 3f90dcc0ab28..057962e736a9 100644 --- a/app-admin/ansible-lint/ansible-lint-24.2.0.ebuild +++ b/app-admin/ansible-lint/ansible-lint-24.6.0.ebuild @@ -4,8 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 pypi @@ -21,17 +20,18 @@ PROPERTIES="test_network" RESTRICT="test" RDEPEND=" - >=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}] - >=dev-python/ansible-compat-4.1.11[${PYTHON_USEDEP}] - >=dev-python/black-22.8.0[${PYTHON_USEDEP}] + >=app-admin/ansible-core-2.13.0[${PYTHON_USEDEP}] + >=dev-python/ansible-compat-24.5.0[${PYTHON_USEDEP}] + >=dev-python/black-24.3.0[${PYTHON_USEDEP}] >=dev-python/filelock-3.8.0[${PYTHON_USEDEP}] + dev-python/importlib-metadata[${PYTHON_USEDEP}] >=dev-python/jsonschema-4.17.0[${PYTHON_USEDEP}] >=dev-python/packaging-21.3[${PYTHON_USEDEP}] >=dev-python/pathspec-0.10.3[${PYTHON_USEDEP}] >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP}] >=dev-python/rich-12.0.0[${PYTHON_USEDEP}] >=dev-python/ruamel-yaml-0.18.5[${PYTHON_USEDEP}] - >=dev-python/wcmatch-8.3.2[${PYTHON_USEDEP}] + >=dev-python/wcmatch-8.5.0[${PYTHON_USEDEP}] >=dev-util/yamllint-1.30.0[${PYTHON_USEDEP}] dev-vcs/git" BDEPEND=" diff --git a/app-admin/ansible-lint/metadata.xml b/app-admin/ansible-lint/metadata.xml index 094d18cbba43..fffa95157a95 100644 --- a/app-admin/ansible-lint/metadata.xml +++ b/app-admin/ansible-lint/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="pypi">ansible-lint</remote-id> <remote-id type="github">ansible/ansible-lint</remote-id> diff --git a/app-admin/ansible-modules-hashivault/Manifest b/app-admin/ansible-modules-hashivault/Manifest index dd593c9ebb12..2dbe0830c118 100644 --- a/app-admin/ansible-modules-hashivault/Manifest +++ b/app-admin/ansible-modules-hashivault/Manifest @@ -1,2 +1 @@ -DIST ansible-modules-hashivault-4.6.8.tar.gz 94253 BLAKE2B 2b6a315cfd051a2e16d889a8784a9185b86b98b3d96ba19f6bdde8b628ce94622c360b60cb59dfcae790fc822f2c41eacd5428356b48324aa2704f0048821c2d SHA512 4b3487e553e6dea5fbefbb383ce22d018ed9f83378d601574badfb2be8dd3f98c54caf975690d3116df6cca970d8e2d3932f0d0ccb1f18f7145aee0beae79f96 -DIST ansible-modules-hashivault-5.1.0.gh.tar.gz 100025 BLAKE2B 6bedb1269a5f39be777ab24e973a52a708d5871cf99f6e7018caa703bc4e8222fec9a40b6b5b980c67e2574034511fe810cba656278336dce0ca3b52f880bcb6 SHA512 cc442a80a4a15e013352202912af6db889afe793aa5baebd8056312eea42c7a819fdae32c9199ec297b9c4aa30719017bff964934d7f94571f368996328619ab +DIST ansible-modules-hashivault-5.2.1.gh.tar.gz 101636 BLAKE2B 3395dc86917b8a35b6ff34f9c518969100fde0e0f760760cbf7c126f5f782e22a01bfe60e9dae89cef49839e80d4f5c0ff2731672cdd616c3eac545d6b507072 SHA512 374edef8c47a27c6a9cde55e8b9294b05c0f222a2ff21e68551558e197d6a938c17a88fa85f18e25f2123585ed0465507b2759036ac834a55ee68c13f54304b4 diff --git a/app-admin/ansible-modules-hashivault/ansible-modules-hashivault-4.6.8.ebuild b/app-admin/ansible-modules-hashivault/ansible-modules-hashivault-4.6.8.ebuild deleted file mode 100644 index 657bfb2bda2b..000000000000 --- a/app-admin/ansible-modules-hashivault/ansible-modules-hashivault-4.6.8.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{9..10} ) -inherit distutils-r1 - -DESCRIPTION="Ansible module for hashicorp vault" -HOMEPAGE="https://www.ansible.com/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/TerryHowe/ansible-modules-hashivault.git" -else - SRC_URI="https://github.com/TerryHowe/ansible-modules-hashivault/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="MIT" -SLOT="0" - -RDEPEND=" - >=app-admin/ansible-2.0.0[${PYTHON_USEDEP}] - >=dev-python/hvac-0.9.5[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] -" - -# The tests require a private instance of vault -RESTRICT="test" diff --git a/app-admin/ansible-modules-hashivault/ansible-modules-hashivault-5.1.0.ebuild b/app-admin/ansible-modules-hashivault/ansible-modules-hashivault-5.2.1.ebuild index 054808151350..729da2c55e80 100644 --- a/app-admin/ansible-modules-hashivault/ansible-modules-hashivault-5.1.0.ebuild +++ b/app-admin/ansible-modules-hashivault/ansible-modules-hashivault-5.2.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 @@ -21,8 +21,8 @@ LICENSE="MIT" SLOT="0" RDEPEND=" - >=app-admin/ansible-5.0.0[${PYTHON_USEDEP}] - >=dev-python/hvac-1.0.0[${PYTHON_USEDEP}] + >=app-admin/ansible-2.12.0[${PYTHON_USEDEP}] + >=dev-python/hvac-1.2.1[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] " diff --git a/app-admin/ansible-molecule/Manifest b/app-admin/ansible-molecule/Manifest index b850ee05029c..a9ab839d7c5c 100644 --- a/app-admin/ansible-molecule/Manifest +++ b/app-admin/ansible-molecule/Manifest @@ -1 +1 @@ -DIST molecule-5.1.0.tar.gz 335161 BLAKE2B 55c2f3c181bef6ab848cf7b52b19649fd861dbdbd68b92d3de9e0a1330755b9b887affd8f78e92ab33145ed60e7131d3cf1ffb7b4d8f10c1c3cab8dd58288af9 SHA512 4d025a512e3a6ac7f424318f06bb23b2c1ef1cc122d31d012430bfccf4efeeb3c7ddf2450abd78378c1c50f54fffb1fa8f366f14eebe58125f177ced8cec3ff5 +DIST molecule-24.2.1.tar.gz 343228 BLAKE2B 9605b5a8e21d37597cbf35f0f6f811471909dde5496541b1d7cd130eb2b970125fdc291df6493f8716f38514df17d957094604ae49e64d16f2207a0d3682bd38 SHA512 3813163d72cee51987d340c8a1ed0e03d8abe509a601e94c3e32bf673a56edd83d0c2bde1347057fe8a4c2b37e11a068ef689dd669d4395da64bec3921f1403d diff --git a/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild b/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild index 66a672771a29..ab9a79f80bdc 100644 --- a/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild +++ b/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=setuptools DOCS_BUILDER="mkdocs" DOCS_DEPEND=" - >=dev-python/mkdocs-ansible-0.1.4 + >=dev-python/mkdocs-ansible-24.3.0 dev-python/mkdocs-autorefs dev-python/mkdocstrings-python media-gfx/cairosvg @@ -25,9 +25,16 @@ SLOT="0" KEYWORDS="amd64 ~arm64 ~riscv" IUSE="selinux" +# Since around the time of the switch to the yy.m.patchlevel versioning scheme +# the test suite has been completely incompatible with Portage, with several +# tests which do pass under Tox failing even with disabled sandboxing. +# Nb. As of 24.2.1 two tests fail even under Tox, for both PyPI and GitHub +# tarballs. +RESTRICT="test" + RDEPEND="$(python_gen_cond_dep ' >=app-admin/ansible-core-2.12.10[${PYTHON_USEDEP}] - >=dev-python/ansible-compat-4.1.2[${PYTHON_USEDEP}] + >=dev-python/ansible-compat-4.1.8[${PYTHON_USEDEP}] >=dev-python/click-8.0[${PYTHON_USEDEP}] <dev-python/click-9[${PYTHON_USEDEP}] >=dev-python/click-help-colors-0.9[${PYTHON_USEDEP}] @@ -38,11 +45,10 @@ RDEPEND="$(python_gen_cond_dep ' <dev-python/pluggy-2.0[${PYTHON_USEDEP}] >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] >=dev-python/rich-9.5.1[${PYTHON_USEDEP}] - >=dev-util/cookiecutter-1.7.3[${PYTHON_USEDEP}] selinux? ( sys-libs/libselinux[python,${PYTHON_USEDEP}] ) ')" BDEPEND="$(python_gen_cond_dep ' - <dev-python/setuptools-scm-8[${PYTHON_USEDEP}] + >=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}] doc? ( dev-python/pillow[truetype,${PYTHON_USEDEP}] media-fonts/roboto @@ -55,13 +61,12 @@ BDEPEND="$(python_gen_cond_dep ' <dev-python/pexpect-5[${PYTHON_USEDEP}] >=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}] >=dev-python/pytest-plus-0.4.0[${PYTHON_USEDEP}] - >=dev-python/pytest-testinfra-7.0.0[${PYTHON_USEDEP}] >=dev-python/pytest-xdist-3.1.0[${PYTHON_USEDEP}] ) ')" PATCHES=( - "${FILESDIR}"/${PN}-5.1.0-mkdocs_google_fonts.patch + "${FILESDIR}"/${PN}-24.2.1-mkdocs_google_fonts.patch ) # test_role.py doesn't play nicely with FEATURES=usersandbox. As for test_command.py: diff --git a/app-admin/ansible-molecule/files/ansible-molecule-24.2.1-mkdocs_google_fonts.patch b/app-admin/ansible-molecule/files/ansible-molecule-24.2.1-mkdocs_google_fonts.patch new file mode 100644 index 000000000000..bf8883258f79 --- /dev/null +++ b/app-admin/ansible-molecule/files/ansible-molecule-24.2.1-mkdocs_google_fonts.patch @@ -0,0 +1,10 @@ +--- a/mkdocs.yml ++++ b/mkdocs.yml +@@ -9,6 +9,7 @@ + + theme: + name: ansible ++ font: false + features: + - announce.dismiss + - content.action.edit diff --git a/app-admin/ansible-molecule/files/ansible-molecule-5.1.0-mkdocs_google_fonts.patch b/app-admin/ansible-molecule/files/ansible-molecule-5.1.0-mkdocs_google_fonts.patch deleted file mode 100644 index 2b3f6af82dcc..000000000000 --- a/app-admin/ansible-molecule/files/ansible-molecule-5.1.0-mkdocs_google_fonts.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/mkdocs.yml -+++ b/mkdocs.yml -@@ -19,6 +19,7 @@ - - navigation.indexes - - navigation.tracking - - toc.integrate -+ font: false - palette: - - media: "(prefers-color-scheme: light)" - primary: teal diff --git a/app-admin/ansible-molecule/metadata.xml b/app-admin/ansible-molecule/metadata.xml index fb47216c4e5e..01b4a1a6d74c 100644 --- a/app-admin/ansible-molecule/metadata.xml +++ b/app-admin/ansible-molecule/metadata.xml @@ -1,10 +1,7 @@ <?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> + <!-- maintainer-needed --> <stabilize-allarches/> <upstream> <remote-id type="pypi">molecule</remote-id> diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest index a88350caf063..46d205a3f46c 100644 --- a/app-admin/ansible/Manifest +++ b/app-admin/ansible/Manifest @@ -1,4 +1,4 @@ +DIST ansible-10.2.0.tar.gz 39352378 BLAKE2B 46af9df464462ee906a4eef114da480c7bf027a29900971be56720729ffc6d2ad6d327cfd2e64f2a8834f4b45af69ee09cd732596de6d3670b777211e24bbdd9 SHA512 35b8e73ccabc15d622da2e34e9075304fb4ee3ef735e5ab1fa9d7673b5f3aad8cf6beacd697d8258914e6ea221c8ddbed4b1bee725590f2a5b4fa78458e692d5 DIST ansible-7.7.0.tar.gz 40709642 BLAKE2B ee2f8d124f79ca3a3f131bfbc4f93e10d104a38262b7d60edd2a88284275fecdd3acf0e566a5cc81a1fb6a179a0b7c51215f2945d669be4c6af7aa2a4f31ade0 SHA512 7da6845c9a68f2b8c10cf3e4cc6ea347861d5b59daa6ac895731ac79b733c6724d234345054fe9e3bf4ea460345b9026492fda42dce22bfbc027c9b4de093fd9 DIST ansible-8.7.0.tar.gz 49317896 BLAKE2B d5923753e368e908a569c5f8f261b1afe7c51d5381db190bf7de1e81f0a6359136581852faa2974f174e816944c66e2c0f625d3d62bdde324758309982c90de9 SHA512 6a67f8553c3fa56559e4a31ec627cfe2c5f42e147d94bea305ec4580af9ba8add136092b209a5a3d7f9022407e9d557484f044d23cb227973fe4e4341fed7983 -DIST ansible-9.1.0.tar.gz 48839908 BLAKE2B caa652b339fb93334bff7246d1bab6bbdd9672a096637aa0695cd94a7f50d0e5ca7a1bfeb559792833c97eb9d16486965776b609354dc05ca63b1474d43e767b SHA512 ec6d86b3d05e66053001720b6b7d7bd1dba8bd50917c913e1f08a63b0c94f76a5d69732c78e793d038622a0b8c652860290a89cee1dfb22491a81763923ef843 -DIST ansible-9.3.0.tar.gz 38240168 BLAKE2B 0cd243a21b12163fcb37f014a69f6041f9c48dae84d1aeea342713daf8150246efa14ac94f43890e449896d111f1839ebe2dba7d9c48c2359fb01e4aadfd270b SHA512 71eff05455aee0a013b69790145a73325ac7037fc509545a7cdca358aa54c1731f7dc6fb0169f602d668e9da9e41a0879ff48ba1243d372e02dae9382ac46c5c +DIST ansible-9.4.0.tar.gz 38389836 BLAKE2B a2e08088565e6f248c1185ee96ac2365fc1385993d3f3fe68f941e8acb0e567c3defeec3ea376a30213921f02881bce0a0ac737323fc3ec82dc77d2d4a550dbd SHA512 4c75235a866f3f95cda8dd3b6c9d22b916ad117d54a86a30585f71c9015cd98db764afa225af5b2f6fa884af558ee488785e26c9e8b9e8be105062f069f065b2 diff --git a/app-admin/ansible/ansible-9.1.0.ebuild b/app-admin/ansible/ansible-10.2.0.ebuild index 09a9b1e9bd54..04e06e19e569 100644 --- a/app-admin/ansible/ansible-9.1.0.ebuild +++ b/app-admin/ansible/ansible-10.2.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{11..12} ) inherit distutils-r1 pypi @@ -13,11 +13,11 @@ HOMEPAGE="https://www.ansible.com/" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" +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" +RDEPEND=">=app-admin/ansible-core-2.17.0 + <app-admin/ansible-core-2.18" python_compile() { local -x ANSIBLE_SKIP_CONFLICT_CHECK=1 diff --git a/app-admin/ansible/ansible-9.3.0.ebuild b/app-admin/ansible/ansible-9.4.0.ebuild index 51baea072b8f..51baea072b8f 100644 --- a/app-admin/ansible/ansible-9.3.0.ebuild +++ b/app-admin/ansible/ansible-9.4.0.ebuild diff --git a/app-admin/ansible/metadata.xml b/app-admin/ansible/metadata.xml index 73a2e474e953..32affbcfbda2 100644 --- a/app-admin/ansible/metadata.xml +++ b/app-admin/ansible/metadata.xml @@ -5,10 +5,6 @@ <email>prometheanfire@gentoo.org</email> <name>Matthew Thode</name> </maintainer> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> <upstream> <remote-id type="pypi">ansible</remote-id> <remote-id type="github">ansible/ansible</remote-id> diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest index ec4f70d5c0c4..fb5e5f415512 100644 --- a/app-admin/apache-tools/Manifest +++ b/app-admin/apache-tools/Manifest @@ -1,2 +1,3 @@ -DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c SHA512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155 -DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2 SHA512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1 +DIST httpd-2.4.59.tar.bz2 7503198 BLAKE2B 836e3538a120d71c016149397a4efd61ae6acd8a8fb9d2ce117c7d86209c4b40c0be3c464007891f28c58182e9d40a8793abe9e94e642354492954af91d9878c SHA512 209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2 +DIST httpd-2.4.61.tar.bz2 7512908 BLAKE2B 9299ef5843888829143732b3a60d1713aff688ed2f6c2b7f154be16bc075ec747a5b116716f188491ebc9947ff2dfe09dfc71f5245d98a4be3ba27ada28ec8a5 SHA512 00656220ecc2b80788f539536553f0a3a57602fb981be22e63af87d0f98ffe5da3056e722ce52ae8cf9c2111ad1922b3aaea1fd7d69d0ed76795199203d593ff +DIST httpd-2.4.62.tar.bz2 7521661 BLAKE2B 0e5c3b05819771e6ff72933ad715695199a32c384f63de6598e179ff5803580f04639437829305150305c9a2b7d309178552d8c9a2d7248a034c98f445193b95 SHA512 7db1876805d5c0f60f49bcb51f75cdf567120f2ff6349e68f084e9a86ae38265d9f1c67e7fca0082c9db136f3c408a88501ee11f26b1b68724ba240867171d77 diff --git a/app-admin/apache-tools/apache-tools-2.4.57.ebuild b/app-admin/apache-tools/apache-tools-2.4.59.ebuild index f3af585656d2..f3af585656d2 100644 --- a/app-admin/apache-tools/apache-tools-2.4.57.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.59.ebuild diff --git a/app-admin/apache-tools/apache-tools-2.4.61.ebuild b/app-admin/apache-tools/apache-tools-2.4.61.ebuild new file mode 100644 index 000000000000..f25e9b88cde5 --- /dev/null +++ b/app-admin/apache-tools/apache-tools-2.4.61.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm" +HOMEPAGE="https://httpd.apache.org/" +SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2" +S="${WORKDIR}/httpd-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="ssl" + +RDEPEND=">=dev-libs/apr-1.5.0:1= + dev-libs/apr-util:1= + dev-libs/expat + dev-libs/libpcre2 + virtual/libcrypt:= + kernel_linux? ( sys-apps/util-linux ) + ssl? ( dev-libs/openssl:0= )" +DEPEND="${RDEPEND} + dev-build/libtool" +BDEPEND=" + virtual/pkgconfig +" + +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446 + "${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868 + "${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833 +) + +src_prepare() { + default + + # This package really should upgrade to using pcre's .pc file. + cat <<-\EOF > "${T}"/pcre2-config + #!/usr/bin/env bash + flags=() + for flag; do + if [[ ${flag} == "--version" ]]; then + flags+=( --modversion ) + else + flags+=( "${flag}" ) + fi + done + exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}" + EOF + chmod a+x "${T}"/pcre2-config || die + + # Only here for libtool and which patches + eautoreconf +} + +src_configure() { + # Silly check. + tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" + + tc-export PKG_CONFIG + export ac_cv_path_PKGCONFIG="${PKG_CONFIG}" + export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config + + local myeconfargs=( + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules + --sbindir="${EPREFIX}"/usr/sbin + --with-z="${EPREFIX}"/usr + --with-apr="${ESYSROOT}"/usr + --with-apr-util="${ESYSROOT}"/usr + --without-pcre + --with-pcre2="${T}"/pcre2-config + $(use_enable ssl) + $(usex ssl '--with-ssl="${EPREFIX}"/usr' '') + ) + + # econf overwrites the stuff from config.layout. + econf "${myeconfargs[@]}" + + sed -i \ + -e '/^LTFLAGS/s:--silent::' \ + build/rules.mk build/config_vars.mk || die +} + +src_compile() { + emake -C support +} + +src_install() { + emake -C support DESTDIR="${D}" install + dodoc CHANGES + doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \ + docs/man/{htcacheclean,rotatelogs}.8 + + # Providing compatiblity symlinks for #177697 (which we'll stop to install + # at some point). + pushd "${ED}"/usr/sbin >/dev/null || die + local i + for i in *; do + dosym ${i} /usr/sbin/${i}2 + done + popd >/dev/null || die + + # Provide a symlink for ab-ssl + if use ssl ; then + dosym ab /usr/bin/ab-ssl + dosym ab /usr/bin/ab2-ssl + fi +} diff --git a/app-admin/apache-tools/apache-tools-2.4.58.ebuild b/app-admin/apache-tools/apache-tools-2.4.62.ebuild index f3af585656d2..d5a375b77cbc 100644 --- a/app-admin/apache-tools/apache-tools-2.4.58.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.62.ebuild @@ -8,12 +8,12 @@ inherit autotools toolchain-funcs DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm" HOMEPAGE="https://httpd.apache.org/" SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2" +S="${WORKDIR}/httpd-${PV}" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="ssl" -RESTRICT="test" RDEPEND=">=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= @@ -28,7 +28,7 @@ BDEPEND=" virtual/pkgconfig " -S="${WORKDIR}/httpd-${PV}" +RESTRICT="test" PATCHES=( "${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446 diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml index 42a6908bb91a..926d74e0de11 100644 --- a/app-admin/apg/metadata.xml +++ b/app-admin/apg/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">wilx/apg</remote-id> </upstream> diff --git a/app-admin/authbind/Manifest b/app-admin/authbind/Manifest index 58d3060a2f18..6009e546afb6 100644 --- a/app-admin/authbind/Manifest +++ b/app-admin/authbind/Manifest @@ -1 +1,2 @@ DIST authbind_2.1.2.tar.gz 15279 BLAKE2B 5f9a31c9f51c307e9ad85bf14b436e1780d0c7dc5655ad3882e9596927862be0684d0a4a43c7d2e98a0d6a0d4c2552aaaf954ce32d3e9202bf5593ce501b5962 SHA512 85020af9703f8f39194a7719c50a51d75344db9ea99ecbc83c3c6bff0852ab1ea1cbd0b9bff6a2345e08a7bef9732e36890f33af08929e36dae8215dd070cc4d +DIST authbind_2.1.3.tar.gz 15215 BLAKE2B c74b7caf27b6a26cf924084fe79dff1ccf429d2a0e9773690407b5f40b07589841b857fe8fda50c1251825fbabf9054c54ab79dea38026bbae770a47a774610b SHA512 357c8f5c5ad446e75a597d5bc5bb5af7db17de771643a39976b5ac1425f03bf44f322c8dd07b0e1b04a0bf78d5000841b4866e0d0945584689e99291156dfac1 diff --git a/app-admin/authbind/authbind-2.1.3.ebuild b/app-admin/authbind/authbind-2.1.3.ebuild new file mode 100644 index 000000000000..7df60af86ca9 --- /dev/null +++ b/app-admin/authbind/authbind-2.1.3.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Bind sockets to privileged ports without root" +HOMEPAGE="https://www.chiark.greenend.org.uk/ucgi/~ian/git/authbind.git/" +SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz" +S="${WORKDIR}/work" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="app-alternatives/awk" + +PATCHES=( + "${FILESDIR}/${PN}-2.1.2-respect-flags.patch" +) + +src_configure() { + tc-export CC LD + + sed -i \ + -e "s|^prefix=.*|prefix=/usr|" \ + -e "s|^lib_dir=.*|lib_dir=\$(prefix)/$(get_libdir)|" \ + -e "s|^libexec_dir=.*|libexec_dir=\$(prefix)/libexec/authbind|" \ + -e "s|^SHARED_LDFLAGS=.*|SHARED_LDFLAGS=$(raw-ldflags)|" \ + Makefile || die "sed failed" + + sed -i \ + -e 's|/usr/lib|/usr/libexec|' \ + authbind-helper.8 || die "sed failed" +} + +src_install() { + dobin authbind + doman authbind.1 authbind-helper.8 + + local major=$(awk -F= '/MAJOR=/ { print $2 }' Makefile || die) + ln -s libauthbind.so.* libauthbind.so.${major} || die + dolib.so libauthbind.so* + + exeinto /usr/libexec/authbind + exeopts -m4755 + doexe helper + + keepdir /etc/authbind/by{addr,port,uid} + + dodoc debian/changelog +} diff --git a/app-admin/awscli-bin/metadata.xml b/app-admin/awscli-bin/metadata.xml index db463f3eeb66..b60727e29e46 100644 --- a/app-admin/awscli-bin/metadata.xml +++ b/app-admin/awscli-bin/metadata.xml @@ -5,4 +5,7 @@ <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> + <upstream> + <remote-id type="github">aws/aws-cli</remote-id> + </upstream> </pkgmetadata> diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest index 4114fb26c457..39aa5a588d56 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -1,3 +1,7 @@ -DIST aws-cli-1.32.44.gh.tar.gz 2650447 BLAKE2B 880877517e3165f30fdcf9295ddc30dc7a127c1cba260fb2ff4c433311f7a7f1e5d221beb47cf008b68efe96a1b087720ae4de7868a90af76a35213eca2754f8 SHA512 9a0d702cf5a2e555118d6cd958c771de35e804add546de2e50bcd499744e43d37e273f543d6b2864635f79f82ce0e6ffc73b977c25304fe9d6aad063216261ee -DIST aws-cli-1.32.49.gh.tar.gz 2654398 BLAKE2B fc2e9052b777e1e8bac60621993b55aa01bb0c0e66ad24008498d44b68ecffeaa903d8afd6e361768031c3954e061ed89e24d85fea23454fad8f6d7de4521cfa SHA512 4a5c1d9e92b7e615adb1d6afca0a01a62e55ac4ffd50b9d7634faf0a4e6108c035e78f9f60824bc9a53505ed4a376757ec4c9fc35fb26a2ba8850f7a206919bf -DIST aws-cli-1.32.54.gh.tar.gz 2656395 BLAKE2B 7f41ac7bb0b11ef851cbc1793c202dd38045fda6af3694e1d2c29f2aa07047f116c6bceb5aec72e805494647f801b1523dadef5301322ed9c25426aaccc1289e SHA512 29e591d8f06091cd138c3ff10b15cd0344b5f12e6a4452ce1cde3e6439e1b70ded7f1b60c96c53a6ad699a3e6b49591e5d26b0190d7d6268792b77a883faa6fc +DIST aws-cli-1.33.22.gh.tar.gz 2754043 BLAKE2B 8645a55cc6f0570ce0e69599e010c98019e63f2616af25467eefc0911f09148b64cdb35ba48e488801afe6aaa105f7dc54e1111acb49ed954cc036f9aaf933db SHA512 1425e1fd3df1a3639838517282f3fc6b63019e25288b38e8f56cd2316c6edb695c24a5dfb4ecf572139222bb16006fd55a9912f287c24c1bc16939bcc0f3a48a +DIST aws-cli-1.33.26.gh.tar.gz 2757281 BLAKE2B 04d88160203ff9cfc0c0f22dd9d57c70e95289af769b4639708bc6a760d32b324fe4785def2cfdf17abadfbfd04a2ef974979dd3b9ac6342bea230a297b7c022 SHA512 e4ce9037042edfdeb36a8bfd74f7998664838598af066cf324245ddc04555037f0ff7b69f1e2dbf0cb727932ef9a6c0feef8acafaed00e5b0c94b1b9e59a6c2d +DIST aws-cli-1.33.27.gh.tar.gz 2758530 BLAKE2B c40db2483f0561078d1dc191e1d8c97bae0d0ab00f0ca11db796213567943f7dd816143340c6c9b9c28012d2881d860948138cc41b37555b7416a5289c7a5cd8 SHA512 3716ef6b5ab7db33496f31445d6ec404b89fc8a3fec564dd6644d43d4ea0db12aadcce545a481e955a166000386d8183e801780b6ac16e03bbea0f5ed9a495c5 +DIST aws-cli-1.33.28.gh.tar.gz 2762159 BLAKE2B 6e4f7e0696532aa65ed1f22fac6c91e58b08507dda7ca5f6cb2a91e498006b8aa4a759056472bed376f7421aa6956a58bef55266124dc83e516441e883f87d37 SHA512 2a6921a139957d23cc2f186907f5cbccfc427beb870b9b9420e4578845e1c5931d71e32d0d0ea8badb0009d1540373197793e628d6146b7ebf7e637a0fdf5e8b +DIST aws-cli-1.33.29.gh.tar.gz 2762758 BLAKE2B 352c0b1d861c48df629f880db5b3ef5227128cb35671b0a276521540eeb6e43b627faacacb6e0dd9d35fa9ad8a074529cb7057316c3e05f9132fbf5025064402 SHA512 8594a0034937401337f5b4d05a7a567a8eff3ec6ba154962e8360946ac04e3666794e143a15ba55eba2910d4201dfce55474e6a7f982399c1fc364c0e99c1b92 +DIST aws-cli-1.33.30.gh.tar.gz 2764485 BLAKE2B 0fe483207532b180180e6a3dd81ec93ad6254fbea56ce22de67d0f9f49414db72b6ab1a434c77aac702db2a217e425e3cd4bf021dcc224d64f201c479376c326 SHA512 47b3e856cc93d0e70548a5eae53fc37dfa17982143e886480b1ab3569965d63c73db3b3c7f196c09402d8c368784c253a3f0c415e1a392b8462d8d79ac6a39ec +DIST aws-cli-1.33.31.gh.tar.gz 2765982 BLAKE2B 424422520aada1a5ab21843e61d5027937c1cd306936740ce6fe80ac8beadc5c5885727d716a7efe1890a3a3d7138710cb4b43a04d5293593d8b6fbf94e83ff9 SHA512 d7f860cb1b37c32a05550a43ff4c7e691f90ca8753fead9e1f2590556e589d6748ba163408ffbc7ecb1b1414a9df3590ffd5962aaf2acc6e49fff60a101034cb diff --git a/app-admin/awscli/awscli-1.32.44.ebuild b/app-admin/awscli/awscli-1.33.22.ebuild index b7c9ceb6d88f..350b274749f3 100644 --- a/app-admin/awscli/awscli-1.32.44.ebuild +++ b/app-admin/awscli/awscli-1.33.22.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit bash-completion-r1 distutils-r1 @@ -24,8 +24,8 @@ 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-)" +# botocore is x.(y+1).(z+118), sigh +BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))" RDEPEND=" >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] dev-python/colorama[${PYTHON_USEDEP}] diff --git a/app-admin/awscli/awscli-1.32.54.ebuild b/app-admin/awscli/awscli-1.33.26.ebuild index 4a677affdbc4..c212ce9cac21 100644 --- a/app-admin/awscli/awscli-1.32.54.ebuild +++ b/app-admin/awscli/awscli-1.33.26.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit bash-completion-r1 distutils-r1 @@ -24,8 +24,8 @@ 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-)" +# botocore is x.(y+1).(z+118), sigh +BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))" RDEPEND=" >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] dev-python/colorama[${PYTHON_USEDEP}] diff --git a/app-admin/awscli/awscli-1.32.49.ebuild b/app-admin/awscli/awscli-1.33.27.ebuild index 4a677affdbc4..c212ce9cac21 100644 --- a/app-admin/awscli/awscli-1.32.49.ebuild +++ b/app-admin/awscli/awscli-1.33.27.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit bash-completion-r1 distutils-r1 @@ -24,8 +24,8 @@ 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-)" +# botocore is x.(y+1).(z+118), sigh +BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))" RDEPEND=" >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] dev-python/colorama[${PYTHON_USEDEP}] diff --git a/app-admin/awscli/awscli-1.33.28.ebuild b/app-admin/awscli/awscli-1.33.28.ebuild new file mode 100644 index 000000000000..c212ce9cac21 --- /dev/null +++ b/app-admin/awscli/awscli-1.33.28.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) + +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+1).(z+118), sigh +BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))" +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/rsa[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + !app-admin/awscli-bin +" +BDEPEND=" + test? ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pytest-forked[${PYTHON_USEDEP}] + ) +" + +EPYTEST_XDIST=1 +distutils_enable_tests pytest + +src_prepare() { + # do not rely on bundled deps in botocore (sic!) + find -name '*.py' -exec sed -i \ + -e 's:from botocore[.]vendored import:import:' \ + -e 's:from botocore[.]vendored[.]:from :' \ + {} + || die + # strip overzealous upper bounds on requirements + sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die + distutils-r1_src_prepare +} + +python_test() { + local serial_tests=( + tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows + tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking + tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success + tests/unit/customizations/test_sessionmanager.py + tests/unit/test_compat.py::TestIgnoreUserSignals + tests/unit/test_help.py + tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored + ) + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + EPYTEST_XDIST= epytest "${serial_tests[@]}" + + local EPYTEST_DESELECT=( "${serial_tests[@]}" ) + # integration tests require AWS credentials and Internet access + epytest tests/{functional,unit} +} + +python_install_all() { + newbashcomp bin/aws_bash_completer aws + + insinto /usr/share/zsh/site-functions + newins bin/aws_zsh_completer.sh _aws + + distutils-r1_python_install_all + + rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die +} diff --git a/app-admin/awscli/awscli-1.33.29.ebuild b/app-admin/awscli/awscli-1.33.29.ebuild new file mode 100644 index 000000000000..c212ce9cac21 --- /dev/null +++ b/app-admin/awscli/awscli-1.33.29.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) + +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+1).(z+118), sigh +BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))" +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/rsa[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + !app-admin/awscli-bin +" +BDEPEND=" + test? ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pytest-forked[${PYTHON_USEDEP}] + ) +" + +EPYTEST_XDIST=1 +distutils_enable_tests pytest + +src_prepare() { + # do not rely on bundled deps in botocore (sic!) + find -name '*.py' -exec sed -i \ + -e 's:from botocore[.]vendored import:import:' \ + -e 's:from botocore[.]vendored[.]:from :' \ + {} + || die + # strip overzealous upper bounds on requirements + sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die + distutils-r1_src_prepare +} + +python_test() { + local serial_tests=( + tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows + tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking + tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success + tests/unit/customizations/test_sessionmanager.py + tests/unit/test_compat.py::TestIgnoreUserSignals + tests/unit/test_help.py + tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored + ) + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + EPYTEST_XDIST= epytest "${serial_tests[@]}" + + local EPYTEST_DESELECT=( "${serial_tests[@]}" ) + # integration tests require AWS credentials and Internet access + epytest tests/{functional,unit} +} + +python_install_all() { + newbashcomp bin/aws_bash_completer aws + + insinto /usr/share/zsh/site-functions + newins bin/aws_zsh_completer.sh _aws + + distutils-r1_python_install_all + + rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die +} diff --git a/app-admin/awscli/awscli-1.33.30.ebuild b/app-admin/awscli/awscli-1.33.30.ebuild new file mode 100644 index 000000000000..c212ce9cac21 --- /dev/null +++ b/app-admin/awscli/awscli-1.33.30.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) + +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+1).(z+118), sigh +BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))" +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/rsa[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + !app-admin/awscli-bin +" +BDEPEND=" + test? ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pytest-forked[${PYTHON_USEDEP}] + ) +" + +EPYTEST_XDIST=1 +distutils_enable_tests pytest + +src_prepare() { + # do not rely on bundled deps in botocore (sic!) + find -name '*.py' -exec sed -i \ + -e 's:from botocore[.]vendored import:import:' \ + -e 's:from botocore[.]vendored[.]:from :' \ + {} + || die + # strip overzealous upper bounds on requirements + sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die + distutils-r1_src_prepare +} + +python_test() { + local serial_tests=( + tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows + tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking + tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success + tests/unit/customizations/test_sessionmanager.py + tests/unit/test_compat.py::TestIgnoreUserSignals + tests/unit/test_help.py + tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored + ) + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + EPYTEST_XDIST= epytest "${serial_tests[@]}" + + local EPYTEST_DESELECT=( "${serial_tests[@]}" ) + # integration tests require AWS credentials and Internet access + epytest tests/{functional,unit} +} + +python_install_all() { + newbashcomp bin/aws_bash_completer aws + + insinto /usr/share/zsh/site-functions + newins bin/aws_zsh_completer.sh _aws + + distutils-r1_python_install_all + + rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die +} diff --git a/app-admin/awscli/awscli-1.33.31.ebuild b/app-admin/awscli/awscli-1.33.31.ebuild new file mode 100644 index 000000000000..c212ce9cac21 --- /dev/null +++ b/app-admin/awscli/awscli-1.33.31.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) + +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+1).(z+118), sigh +BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))" +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/rsa[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + !app-admin/awscli-bin +" +BDEPEND=" + test? ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pytest-forked[${PYTHON_USEDEP}] + ) +" + +EPYTEST_XDIST=1 +distutils_enable_tests pytest + +src_prepare() { + # do not rely on bundled deps in botocore (sic!) + find -name '*.py' -exec sed -i \ + -e 's:from botocore[.]vendored import:import:' \ + -e 's:from botocore[.]vendored[.]:from :' \ + {} + || die + # strip overzealous upper bounds on requirements + sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die + distutils-r1_src_prepare +} + +python_test() { + local serial_tests=( + tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows + tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking + tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success + tests/unit/customizations/test_sessionmanager.py + tests/unit/test_compat.py::TestIgnoreUserSignals + tests/unit/test_help.py + tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored + ) + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + EPYTEST_XDIST= epytest "${serial_tests[@]}" + + local EPYTEST_DESELECT=( "${serial_tests[@]}" ) + # integration tests require AWS credentials and Internet access + epytest tests/{functional,unit} +} + +python_install_all() { + newbashcomp bin/aws_bash_completer aws + + insinto /usr/share/zsh/site-functions + newins bin/aws_zsh_completer.sh _aws + + distutils-r1_python_install_all + + rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die +} diff --git a/app-admin/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest index 2380ee61ea57..939a042c14d7 100644 --- a/app-admin/bitwarden-desktop-bin/Manifest +++ b/app-admin/bitwarden-desktop-bin/Manifest @@ -1 +1,2 @@ -DIST Bitwarden-2024.2.0-amd64.deb 79917282 BLAKE2B 2066dc71bed9cddbcedccfd9129e3e81ac9f8a71217d2c651fb8a067b3e318574e26104b447a7ccd6734efded64ef3620cf4a7e36f0a577ed98f5468839540cb SHA512 c9394914fd6c82096fc5336e73b539e250727c6917af97961df0bd7de241f955b9eb87da154f32972c73ea1ce59bf0d79660658277185c89e099360ec4c3ea26 +DIST Bitwarden-2024.6.0-amd64.deb 80663126 BLAKE2B 70855af5b213fee1c8d64f59ba22bd122031070b1fc88d688b2554b223d5b955026c81d54316d30f8b004c0ce098ba493a4deebd93061305184b0aea939df1d2 SHA512 8c88464f0e2281ff44d91ee0da85caaa6f99d3e7d37eab4961c4bd67eaf462a73a0e40d50cc11061d90468d360d42bf5194435e3f11cf71d824f26f69860e573 +DIST Bitwarden-2024.6.4-amd64.deb 79772094 BLAKE2B 4cb5b0f0e96f27176327b531cc259518216e7ded24d7294df58c045544f4421713791db2dbb50a49679fb6ec2d56450f830bdf1bece0ec9972e4fb0af39d3236 SHA512 0d118caa5940ec2c970bf814f879dc997750278c0b3d4b369c2b3439798447d3c8ea5c6312d97ed4efc427167eedae866837b8f96ddd89b173a22b9073d0b4a5 diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.2.0.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.6.0.ebuild index a98f129ada65..a98f129ada65 100644 --- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.2.0.ebuild +++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.6.0.ebuild diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.6.4.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.6.4.ebuild new file mode 100644 index 000000000000..a98f129ada65 --- /dev/null +++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.6.4.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop unpacker xdg-utils + +MY_PN="Bitwarden" + +DESCRIPTION="Bitwarden password manager desktop client" +HOMEPAGE="https://bitwarden.com/" +SRC_URI="https://github.com/bitwarden/clients/releases/download/desktop-v${PV}/Bitwarden-${PV}-amd64.deb" +S="${WORKDIR}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + app-crypt/libsecret + dev-libs/expat + dev-libs/glib + dev-libs/nspr + dev-libs/nss + dev-libs/wayland + media-libs/alsa-lib + media-libs/mesa + net-print/cups + sys-apps/dbus + sys-apps/util-linux + sys-libs/glibc + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libxkbcommon + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libxshmfence + x11-libs/libXtst + x11-libs/pango +" +IDEPEND=" + dev-util/desktop-file-utils + dev-util/gtk-update-icon-cache +" + +QA_PREBUILT=" + opt/Bitwarden/*.so* + opt/Bitwarden/bitwarden + opt/Bitwarden/chrome-sandbox + opt/Bitwarden/chrome_crashpad_handler +" + +src_install() { + insinto /opt + doins -r opt/${MY_PN} + fperms 755 /opt/Bitwarden/bitwarden + fperms 4755 /opt/Bitwarden/chrome-sandbox + + domenu usr/share/applications/bitwarden.desktop + + local x + for x in 16 32 64 128 256 512; do + doicon -s ${x} usr/share/icons/hicolor/${x}*/* + done +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/app-admin/bitwarden-desktop-bin/metadata.xml b/app-admin/bitwarden-desktop-bin/metadata.xml index 4ab515d9e293..4f192903ad6e 100644 --- a/app-admin/bitwarden-desktop-bin/metadata.xml +++ b/app-admin/bitwarden-desktop-bin/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>dlan@gentoo.org</email> + <name>Yixun Lan</name> + </maintainer> <upstream> <remote-id type="github">bitwarden/desktop</remote-id> </upstream> diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index 9301d4735645..66fea02d53c4 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1 +1,2 @@ DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80 SHA512 dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f +DIST calamares-3.3.6.tar.gz 4733000 BLAKE2B 6c5bae1c7939d84fdbf599e7c5b478c799efbdf21f1aa120fda05106775477274eafd5687a787c177b747226c8438aec72acc90414bff9c7952d71ce8cb5e376 SHA512 3fa38f136a7a8c1f7dc2be8f98d2f323e38ab3bb535ffaf833d26839c3a2fe1d1dab392cd103380098328fc7465f262cde7ae09efa996c7fb66233d8391ae4f6 diff --git a/app-admin/calamares/calamares-3.2.60-r4.ebuild b/app-admin/calamares/calamares-3.2.60-r5.ebuild index 370b7cfa23d3..592c5af31d92 100644 --- a/app-admin/calamares/calamares-3.2.60-r4.ebuild +++ b/app-admin/calamares/calamares-3.2.60-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -44,7 +44,7 @@ COMMON_DEPEND="${PYTHON_DEPS} kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode - sys-auth/polkit-qt + sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-4.0.0:5= virtual/libcrypt:= " diff --git a/app-admin/calamares/calamares-3.3.6-r1.ebuild b/app-admin/calamares/calamares-3.3.6-r1.ebuild new file mode 100644 index 000000000000..2036bb2bfb26 --- /dev/null +++ b/app-admin/calamares/calamares-3.3.6-r1.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +PYTHON_COMPAT=( python3_{10..12} ) + +inherit ecm python-single-r1 + +DESCRIPTION="Distribution-independent installer framework" +HOMEPAGE="https://calamares.io" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="5" +KEYWORDS="~amd64" +IUSE="+networkmanager qt6 +upower" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +QT5_MIN="5.15.0" +KF_QT5_MIN="5.78" +QT6_MIN="6.5.0" +KF_QT6_MIN="5.240" + +BDEPEND=" + qt6? ( + >=dev-qt/qttools-${QT6_MIN}:6[linguist] + >=kde-frameworks/extra-cmake-modules-${KF_QT6_MIN} + ) + !qt6? ( + >=dev-qt/linguist-tools-${QT5_MIN}:5 + >=kde-frameworks/extra-cmake-modules-${KF_QT5_MIN} + ) +" +COMMON_DEPEND="${PYTHON_DEPS} + dev-cpp/yaml-cpp:= + $(python_gen_cond_dep ' + >=dev-libs/boost-1.72.0:=[python,${PYTHON_USEDEP}] + dev-libs/libpwquality[${PYTHON_USEDEP}] + ') + qt6? ( + >=dev-qt/qtbase-${QT6_MIN}:6[concurrent,dbus,gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QT6_MIN}:6 + >=dev-qt/qtsvg-${QT6_MIN}:6 + >=dev-qt/qtwebengine-${QT6_MIN}:6[widgets] + >=kde-frameworks/kconfig-${KF_QT6_MIN}:6 + >=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6 + >=kde-frameworks/kcrash-${KF_QT6_MIN}:6 + >=kde-frameworks/ki18n-${KF_QT6_MIN}:6 + >=kde-frameworks/kpackage-${KF_QT6_MIN}:6 + >=kde-frameworks/kparts-${KF_QT6_MIN}:6 + >=kde-frameworks/kservice-${KF_QT6_MIN}:6 + >=kde-frameworks/kwidgetsaddons-${KF_QT6_MIN}:6 + sys-auth/polkit-qt[qt6(-)] + >=sys-libs/kpmcore-24.01.75:6= + ) + !qt6? ( + >=dev-qt/qtconcurrent-${QT5_MIN}:5 + >=dev-qt/qtdbus-${QT5_MIN}:5 + >=dev-qt/qtdeclarative-${QT5_MIN}:5 + >=dev-qt/qtgui-${QT5_MIN}:5 + >=dev-qt/qtnetwork-${QT5_MIN}:5 + >=dev-qt/qtsvg-${QT5_MIN}:5 + >=dev-qt/qtwebengine-${QT5_MIN}:5[widgets] + >=dev-qt/qtwidgets-${QT5_MIN}:5 + >=dev-qt/qtxml-${QT5_MIN}:5 + >=kde-frameworks/kconfig-${KF_QT5_MIN}:5 + >=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5 + >=kde-frameworks/kcrash-${KF_QT5_MIN}:5 + >=kde-frameworks/ki18n-${KF_QT5_MIN}:5 + >=kde-frameworks/kpackage-${KF_QT5_MIN}:5 + >=kde-frameworks/kparts-${KF_QT5_MIN}:5 + >=kde-frameworks/kservice-${KF_QT5_MIN}:5 + >=kde-frameworks/kwidgetsaddons-${KF_QT5_MIN}:5 + sys-auth/polkit-qt[qt5(+)] + >=sys-libs/kpmcore-20.04.0:5= + ) + sys-apps/dbus + sys-apps/dmidecode + virtual/libcrypt:= +" +DEPEND="${COMMON_DEPEND} + test? ( + !qt6? ( dev-qt/qttest:5 ) + ) +" +RDEPEND="${COMMON_DEPEND} + app-admin/sudo + dev-libs/libatasmart + net-misc/rsync + || ( + sys-boot/grub:2 + sys-apps/systemd[boot(-)] + sys-apps/systemd-utils[boot] + ) + sys-boot/os-prober + sys-fs/squashfs-tools + sys-libs/timezone-data + virtual/udev + networkmanager? ( net-misc/networkmanager ) + upower? ( sys-power/upower ) +" + +src_prepare() { + ecm_src_prepare + export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ + PYTHON_INCLUDE_PATH="$(python_get_library_path)"\ + PYTHON_CFLAGS="$(python_get_CFLAGS)"\ + PYTHON_LIBS="$(python_get_LIBS)" + + cp "${FILESDIR}/calamares-gentoo-branding.desc" src/branding/default/branding.desc || die "Failed to overwrite branding file" +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_CONFIG=ON + -DINSTALL_COMPLETION=ON + -DINSTALL_POLKIT=ON + -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON + -DWITH_PYTHON=ON + # Use system instead + -DWITH_PYBIND11=OFF + -DBUILD_APPDATA=ON + -DWITH_QT6="$(usex qt6)" + ) + + ecm_src_configure +} + +src_test() { + local myctestargs=( + # Skipped tests: + # load-dracut: tries and fails to find Dracut config + # libcalamaresnetworktest: needs network + # libcalamaresutilstest: inspects /tmp (expects namespace?) + # + # Need investigation: + # test_libcalamaresuipaste + # validate-netinstall + # validate-services-systemd + # localetest + # machineidtest + # packagechoosertest + # + # Requires removed dev-python/toml + # lint-displaymanager + # + # E1101 + # lint-dummypython + -E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest|lint-displaymanager|lint-dummypython)" + ) + + cmake_src_test +} diff --git a/app-admin/calamares/files/calamares-gentoo-branding.desc b/app-admin/calamares/files/calamares-gentoo-branding.desc new file mode 100644 index 000000000000..9b107b45e3e2 --- /dev/null +++ b/app-admin/calamares/files/calamares-gentoo-branding.desc @@ -0,0 +1,239 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Product branding information. This influences some global +# user-visible aspects of Calamares, such as the product +# name, window behavior, and the slideshow during installation. +# +# Additional styling can be done using the stylesheet.qss +# file, also in the branding directory. +--- +componentName: default + + +### WELCOME / OVERALL WORDING +# +# These settings affect some overall phrasing and looks, +# which are most visible in the welcome page. + +# This selects between different welcome texts. When false, uses +# the traditional "Welcome to the %1 installer.", and when true, +# uses "Welcome to the Calamares installer for %1." This allows +# to distinguish this installer from other installers for the +# same distribution. +welcomeStyleCalamares: true + +# Should the welcome image (productWelcome, below) be scaled +# up beyond its natural size? If false, the image does not grow +# with the window but remains the same size throughout (this +# may have surprising effects on HiDPI monitors). +welcomeExpandingLogo: true + +### WINDOW CONFIGURATION +# +# The settings here affect the placement of the Calamares +# window through hints to the window manager and initial +# sizing of the Calamares window. + +# Size and expansion policy for Calamares. +# - "normal" or unset, expand as needed, use *windowSize* +# - "fullscreen", start as large as possible, ignore *windowSize* +# - "noexpand", don't expand automatically, use *windowSize* +windowExpanding: normal + +# Size of Calamares window, expressed as w,h. Both w and h +# may be either pixels (suffix px) or font-units (suffix em). +# e.g. "800px,600px" +# "60em,480px" +# This setting is ignored if "fullscreen" is selected for +# *windowExpanding*, above. If not set, use constants defined +# in CalamaresUtilsGui, 800x520. +windowSize: 800px,520px + +# Placement of Calamares window. Either "center" or "free". +# Whether "center" actually works does depend on the window +# manager in use (and only makes sense if you're not using +# *windowExpanding* set to "fullscreen"). +windowPlacement: center + +### PANELS CONFIGURATION +# +# Calamares has a main content area, and two panels (navigation +# and progress / sidebar). The panels can be controlled individually, +# or switched off. If both panels are switched off, the layout of +# the main content area loses its margins, on the assumption that +# you're doing something special. + +# Kind of sidebar (panel on the left, showing progress). +# - "widget" or unset, use traditional sidebar (logo, items) +# - "none", hide it entirely +# - "qml", use calamares-sidebar.qml from branding folder +# In addition, you **may** specify a side, separated by a comma, +# from the kind. Valid sides are: +# - "left" (if not specified, uses this) +# - "right" +# - "top" +# - "bottom" +# For instance, "widget,right" is valid; so is "qml", which defaults +# to putting the sidebar on the left. Also valid is "qml,top". +# While "widget,top" is valid, the widgets code is **not** flexible +# and results will be terrible. +sidebar: widget + +# Kind of navigation (button panel on the bottom). +# - "widget" or unset, use traditional navigation +# - "none", hide it entirely +# - "qml", use calamares-navigation.qml from branding folder +# In addition, you **may** specify a side, separated by a comma, +# from the kind. The same sides are valid as for *sidebar*, +# except the default is *bottom*. +navigation: widget + + +### STRINGS, IMAGES AND COLORS +# +# This section contains the "branding proper" of names +# and images, rather than global-look settings. + +# These are strings shown to the user in the user interface. +# There is no provision for translating them -- since they +# are names, the string is included as-is. +# +# The four Url strings are the Urls used by the buttons in +# the welcome screen, and are not shown to the user. Clicking +# on the "Support" button, for instance, opens the link supportUrl. +# If a Url is empty, the corresponding button is not shown. +# +# bootloaderEntryName is how this installation / distro is named +# in the boot loader (e.g. in the GRUB menu). +# +# These strings support substitution from /etc/os-release +# if KDE Frameworks 5.58 are available at build-time. When +# enabled, ${varname} is replaced by the equivalent value +# from os-release. All the supported var-names are in all-caps, +# and are listed on the FreeDesktop.org site, +# https://www.freedesktop.org/software/systemd/man/os-release.html +# Note that ANSI_COLOR and CPE_NAME don't make sense here, and +# are not supported (the rest are). Remember to quote the string +# if it contains substitutions, or you'll get YAML exceptions. +# +# The *Url* entries are used on the welcome page, and they +# are visible as buttons there if the corresponding *show* keys +# are set to "true" (they can also be overridden). +strings: + productName: ${PRETTY_NAME} + shortProductName: ${NAME} + version: ${VERSION_ID} + shortVersion: ${VERSION_ID} + versionedName: ${PRETTY_NAME} ${VERSION_ID} + shortVersionedName: ${NAME} ${VERSION_ID} + bootloaderEntryName: ${NAME} + productUrl: ${HOME_URL} + supportUrl: ${SUPPORT_URL} + knownIssuesUrl: ${BUG_REPORT_URL} + releaseNotesUrl: ${HOME_URL} + donateUrl: ${HOME_URL} + +# These images are loaded from the branding module directory. +# +# productBanner is an optional image, which if present, will be shown +# on the welcome page of the application, above the welcome text. +# It is intended to have a width much greater than height. +# It is displayed at 64px height (also on HiDPI). +# Recommended size is 64px tall, and up to 460px wide. +# productIcon is used as the window icon, and will (usually) be used +# by the window manager to represent the application. This image +# should be square, and may be displayed by the window manager +# as small as 16x16 (but possibly larger). +# productLogo is used as the logo at the top of the left-hand column +# which shows the steps to be taken. The image should be square, +# and is displayed at 80x80 pixels (also on HiDPI). +# productWallpaper is an optional image, which if present, will replace +# the normal solid background on every page of the application. +# It can be any size and proportion, +# and will be tiled to fit the entire window. +# For a non-tiled wallpaper, the size should be the same as +# the overall window, see *windowSize* above (800x520). +# productWelcome is shown on the welcome page of the application in +# the middle of the window, below the welcome text. It can be +# any size and proportion, and will be scaled to fit inside +# the window. Use `welcomeExpandingLogo` to make it non-scaled. +# Recommended size is 320x150. +# +# These filenames can also use substitutions from os-release (see above). +images: + # productBanner: "banner.png" + productIcon: "squid.png" + productLogo: "squid.png" + # productWallpaper: "wallpaper.png" + productWelcome: "languages.png" + +# Colors for text and background components. +# +# - SidebarBackground is the background of the sidebar +# - SidebarText is the (foreground) text color +# - SidebarBackgroundCurrent sets the background of the current step. +# Optional, and defaults to the application palette. +# - SidebarTextCurrent is the text color of the current step. +# +# These colors can **also** be set through the stylesheet, if the +# branding component also ships a stylesheet.qss. Then they are +# the corresponding CSS attributes of #sidebarApp. +style: + SidebarBackground: "#292F34" + SidebarText: "#FFFFFF" + SidebarTextCurrent: "#292F34" + SidebarBackgroundCurrent: "#D35400" + +### SLIDESHOW +# +# The slideshow is displayed during execution steps (e.g. when the +# installer is actually writing to disk and doing other slow things). + +# The slideshow can be a QML file (recommended) which can display +# arbitrary things -- text, images, animations, or even play a game -- +# during the execution step. The QML **is** abruptly stopped when the +# execution step is done, though, so maybe a game isn't a great idea. +# +# The slideshow can also be a sequence of images (not recommended unless +# you don't want QML at all in your Calamares). The images are displayed +# at a rate of 1 every 2 seconds during the execution step. +# +# To configure a QML file, list a single filename: +# slideshow: "show.qml" +# To configure images, like the filenames (here, as an inline list): +# slideshow: [ "/etc/calamares/slideshow/0.png", "/etc/logo.png" ] +slideshow: "show.qml" + +# There are two available APIs for a QML slideshow: +# - 1 (the default) loads the entire slideshow when the installation- +# slideshow page is shown and starts the QML then. The QML +# is never stopped (after installation is done, times etc. +# continue to fire). +# - 2 loads the slideshow on startup and calls onActivate() and +# onLeave() in the root object. After the installation is done, +# the show is stopped (first by calling onLeave(), then destroying +# the QML components). +# +# An image slideshow does not need to have the API defined. +slideshowAPI: 2 + + +# These options are to customize online uploading of logs to pastebins: +# - type : Defines the kind of pastebin service to be used. Currently +# it accepts two values: +# - none : disables the pastebin functionality +# - fiche : use fiche pastebin server +# - url : Defines the address of pastebin service to be used. +# Takes string as input. Important bits are the host and port, +# the scheme is not used. +# - sizeLimit : Defines maximum size limit (in KiB) of log file to be pasted. +# The option must be set, to have the log option work. +# Takes integer as input. If < 0, no limit will be forced, +# else only last (approximately) 'n' KiB of log file will be pasted. +# Please note that upload size may be slightly over the limit (due +# to last minute logging), so provide a suitable value. +uploadServer : + type : "fiche" + url : "http://termbin.com:9999" + sizeLimit : -1 diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest index 7359503f6415..e7be92aa74f9 100644 --- a/app-admin/cdist/Manifest +++ b/app-admin/cdist/Manifest @@ -1,2 +1 @@ -DIST cdist-6.9.8.tar.gz 1385902 BLAKE2B 6190f09d527a562e490669335d604d3173209bb950448855588a78d48428b8522c8f39327d6455d30242d97bb48d810c319f650a1c0c2fba203a348637dc87c1 SHA512 3c78dd5332a5957750948c52c4b27269ada21b07a2fce0d84019b4fcd3b7ddc6221f0179690d1b3af7e685ffafd739e604f50195fbc36a5494a102b2fa1b732b DIST cdist-7.0.0.tar.gz 1395298 BLAKE2B 0dc11302b4a63e24f31d598df63dc5da784cb01d57ade9b67da277b7c27f66b4c31891ce710c3acdc100e92500b0e80e22cf01882b1669fa714d70c44879f7f0 SHA512 bd87b52603443bc9ffd81785a73bc07387e0555da34b04f97619beb39a1bfcf488b84a6a37fac4fe49b9b002080c5f20a50b3f08ac3665c6c2143a4aa4ee47b7 diff --git a/app-admin/cdist/cdist-6.9.8.ebuild b/app-admin/cdist/cdist-6.9.8.ebuild deleted file mode 100644 index 4e75b661c296..000000000000 --- a/app-admin/cdist/cdist-6.9.8.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) - -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 - -DESCRIPTION="A usable configuration management system" -HOMEPAGE="https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist" -SRC_URI="https://code.ungleich.ch/ungleich-public/cdist/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -PATCHES=( "${FILESDIR}"/test.patch ) - -distutils_enable_sphinx docs/src dev-python/sphinx-rtd-theme -distutils_enable_tests unittest - -python_prepare_all() { - echo "VERSION='${PV}'" > cdist/version.py || die "Failed to set version" - distutils-r1_python_prepare_all -} diff --git a/app-admin/cdist/cdist-7.0.0.ebuild b/app-admin/cdist/cdist-7.0.0-r1.ebuild index 074a43f466ea..7186e9fecd36 100644 --- a/app-admin/cdist/cdist-7.0.0.ebuild +++ b/app-admin/cdist/cdist-7.0.0-r1.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) - -DISTUTILS_USE_SETUPTOOLS=no +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 @@ -18,7 +17,9 @@ LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86" -distutils_enable_sphinx docs/src dev-python/sphinx-rtd-theme +distutils_enable_sphinx docs/src \ + dev-python/sphinx-rtd-theme \ + dev-python/six distutils_enable_tests unittest python_prepare_all() { diff --git a/app-admin/cdist/files/test.patch b/app-admin/cdist/files/test.patch deleted file mode 100644 index ebc9d944ba57..000000000000 --- a/app-admin/cdist/files/test.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://code.ungleich.ch/ungleich-public/cdist/commit/3a321469a8ba5aea55220bd70bd4900de732e917 -https://bugs.gentoo.org/831362 -From 3a321469a8ba5aea55220bd70bd4900de732e917 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net> -Date: Tue, 16 Nov 2021 11:11:45 +0100 -Subject: [PATCH] Python 3.10: collections.X -> collections.abc.X - ---- - cdist/integration.py | 2 +- - cdist/util/fsproperty.py | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/cdist/integration.py b/cdist/integration.py -index 17b65f09..04470ea7 100644 ---- a/cdist/integration.py -+++ b/cdist/integration.py -@@ -84,7 +84,7 @@ def _process_hosts_simple(action, host, manifest, verbose, - """ - if isinstance(host, str): - hosts = [host, ] -- elif isinstance(host, collections.Iterable): -+ elif isinstance(host, collections.abc.Iterable): - hosts = host - else: - raise cdist.Error('Invalid host argument: {}'.format(host)) -diff --git a/cdist/util/fsproperty.py b/cdist/util/fsproperty.py -index 09e9cc19..6bf935e8 100644 ---- a/cdist/util/fsproperty.py -+++ b/cdist/util/fsproperty.py -@@ -33,7 +33,7 @@ class AbsolutePathRequiredError(cdist.Error): - return 'Absolute path required, got: {}'.format(self.path) - - --class FileList(collections.MutableSequence): -+class FileList(collections.abc.MutableSequence): - """A list that stores it's state in a file. - - """ -@@ -102,7 +102,7 @@ class FileList(collections.MutableSequence): - self.__write(lines) - - --class DirectoryDict(collections.MutableMapping): -+class DirectoryDict(collections.abc.MutableMapping): - """A dict that stores it's items as files in a directory. - - """ diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest index 7a1cdeaca1f7..5c7039ce6119 100644 --- a/app-admin/checksec/Manifest +++ b/app-admin/checksec/Manifest @@ -1,3 +1,5 @@ DIST checksec-2.4.0.tar.gz 2242079 BLAKE2B c1878c1312d13591147f0efd1a2d535ae8e75292dbc53e7ba0802c8d165b18b4bc0b22a5cc3a9159ddcf05a1518d58c18cb54700ea5a52ff29d261068194b96a SHA512 1a02dfac48b5979cb5c2eb7b8f1fe290d3ac090726d1b95a14864bfc4bc3d32eefc10e2cc227c9dc01809c78fe003d1faea9b720d5cb5fbc16599fc0e2512947 DIST checksec-2.5.0.tar.gz 2623122 BLAKE2B b4a876dfc8b9f02d5d74b6720b59ee216fbdab4e7df471aa4a78e7e6a98830b1b03f9a66d8b9dd344261fe1a253db4e5e9bede53f47e1fd171b2d23b0e04f031 SHA512 dd76061976d7f97c250b9d24b9cc7c6ea26c9df7e3521e3a1f39f56812485afaae6d60c611e1b7f4817b1585d10fc2116eaa032bb690e39a0243529e324943ab DIST checksec-2.6.0.tar.gz 2624551 BLAKE2B bfda79dfdfc672119d70612497893ba91f093719f95e2b387d27da81d7f8b50e2bc54e9d030d84db76dc2a599bb1f866608529149896259ce517450318640c82 SHA512 71ba0f24b7db0c7fa74dfeaa74b2722ffe792c77941316da916dc7aae888f147c81f98d1522f63b96aa3a76aff7bb1d98522a02efa312b3b3a9dd9a137239010 +DIST checksec-2.7.0.tar.gz 2631553 BLAKE2B c44bcc1a5090a29563ce7e8694ead74230d43f469a71e8388c06138afe5192280366315f3921961adddb367cbab81a1948f45096cbb64a7d8fdb6de849dc1698 SHA512 194a6f33042fcec94bbc463659066abdda644da42f68dd8001ba263a2679bd49a4443229cd5ddffd75afe693d255dc7f081c95eeeff940ac8a0e53313972f03b +DIST checksec-2.7.1.tar.gz 3707821 BLAKE2B 1325f3b1496cbc7cab76eb28773be36c52e7069bab5c62579058130d12dfde1361efc086d04c8dc2da3105359f8c7b4844aae7e01ae14dae3a5b013db3e1170e SHA512 877a08cc2e335dc6378d52fc2e1ff39860dcf646e17be04addc50de99a3c68c1eaba0f843d6844ec9d3c687d7245379a008a2230838dc7a48e5b28893eacdee0 diff --git a/app-admin/checksec/checksec-2.6.0-r1.ebuild b/app-admin/checksec/checksec-2.6.0-r1.ebuild index 3be8fd79b6c4..0321a7407061 100644 --- a/app-admin/checksec/checksec-2.6.0-r1.ebuild +++ b/app-admin/checksec/checksec-2.6.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -10,7 +10,7 @@ SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="" S="${WORKDIR}"/${MY_PN}-${PV} diff --git a/app-admin/checksec/checksec-2.7.0.ebuild b/app-admin/checksec/checksec-2.7.0.ebuild new file mode 100644 index 000000000000..a2f8d3fd3f08 --- /dev/null +++ b/app-admin/checksec/checksec-2.7.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +MY_PN=${PN}.sh +DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)" +HOMEPAGE="https://github.com/slimm609/checksec.sh" +SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="" + +S="${WORKDIR}"/${MY_PN}-${PV} + +RDEPEND="!<dev-util/pwntools-4.10.0_beta0-r2" + +DOCS=( ChangeLog README.md ) + +src_prepare() { + sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die + rm Makefile || die + default +} + +src_install() { + default + + doman extras/man/* + + insinto /usr/share/zsh/site-functions + doins extras/zsh/_${PN} + + dobin ${PN} +} diff --git a/app-admin/checksec/checksec-2.7.1.ebuild b/app-admin/checksec/checksec-2.7.1.ebuild new file mode 100644 index 000000000000..a2f8d3fd3f08 --- /dev/null +++ b/app-admin/checksec/checksec-2.7.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +MY_PN=${PN}.sh +DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)" +HOMEPAGE="https://github.com/slimm609/checksec.sh" +SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="" + +S="${WORKDIR}"/${MY_PN}-${PV} + +RDEPEND="!<dev-util/pwntools-4.10.0_beta0-r2" + +DOCS=( ChangeLog README.md ) + +src_prepare() { + sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die + rm Makefile || die + default +} + +src_install() { + default + + doman extras/man/* + + insinto /usr/share/zsh/site-functions + doins extras/zsh/_${PN} + + dobin ${PN} +} diff --git a/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild b/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild index a2b83781f3df..976bbed15cd3 100644 --- a/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild +++ b/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Chroot any dynamically linked application in a safe and sane manner" HOMEPAGE="https://chrootsafe.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN//_}/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN//_}/${P}.tgz" LICENSE="MIT" SLOT="0" diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml index b72376271f95..b151837c352f 100644 --- a/app-admin/clsync/metadata.xml +++ b/app-admin/clsync/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> Clsync recursively watches for source directory and executes external program to sync the changes. Clsync is adapted to be used together with rsync. diff --git a/app-admin/clustershell/metadata.xml b/app-admin/clustershell/metadata.xml index 42b405dcafb7..6589872592ea 100644 --- a/app-admin/clustershell/metadata.xml +++ b/app-admin/clustershell/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> - <maintainer type="person"> <email>arkamar@gentoo.org</email> <name>Petr Vaněk</name> </maintainer> diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index d1d8812ba822..a6b734c34009 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -1,2 +1,3 @@ -DIST conky-1.19.6.tar.gz 1727487 BLAKE2B 2ef2b0acd354559679b9d7d442de7a709e932418e27459b02bdf2f8b6dbdcf7911964932ab9851bab213e7f68d9a82034acab96892752544ab1a26d68c174c09 SHA512 9f1900f495125c668835334239b69fc098c30fe450a384786d873eb3d3e955ff0f06ca70c3a94f47a4b38a42d4510be77efd13873411f11ff84d8bfdc2869fde -DIST conky-1.19.7.tar.gz 1725945 BLAKE2B f5e6eb1675a1db25d96f28e10e23b55a2c2560d8854145193d6472b958295ab47015061187f5c5ca2b24573ec0e8574fdd2eab1003ebdb3bd5b74b7b00f68571 SHA512 54041cfa5c1d135d751fe8852523e7ad55815ecc9d9af87251e26edd38801e1e36be2f67b390376015090052f21f6c28992edd551c0dab8ae3c22f8facd3542e +DIST conky-1.19.8.tar.gz 1711683 BLAKE2B f1c1057f07570e63026e51a03fc4d7a51cc1dcaefb963b5f9ce9fba4e71342770bc1a59aa9a834fe8f9d6d552e7775ab0e2d5a487d9b6ec2d215768349c4994c SHA512 bdc5b29bea3a3050f4fe4ce76fc642134d93a91362e491203dc10cdde1d9c1bde8a106cd8388aab1893e4b1def058abf1f35c1fd022c26ac773071ddd44abbc4 +DIST conky-1.21.3.tar.gz 2147056 BLAKE2B 0cc2e783f5e4cc0be688abaa96c4a68fa5d7be4a776866ad59d29d8338262fa11d929f9c3e3167b15c09c837cf4bafb16d201c8b13fff9b5e1a960a4bd33b420 SHA512 14ca23a15eaa2670b9c37939950077868e206aa301a24d88b765a11944ff149fc55695fe040782a73510d1b8eee964c51cec2614b9a51873379770545cd47570 +DIST conky-1.21.4.tar.gz 1960582 BLAKE2B f51a8ca62e65409c2eacbccf785d3e4b3c924e9fb3f1dcae8142db94ec54540a842c9871cbfa2601c72df1ceb2a94fb1b60e65d975c23506188b0dd051e61bca SHA512 07569243e4f4eee98c1a0134b9ab06143e191215400d9cfef5edb155cd89b258fff05026db4f7c58e1f98e942c0753f878eda45a157099c7a8b9e73b49017496 diff --git a/app-admin/conky/conky-1.19.7.ebuild b/app-admin/conky/conky-1.19.8.ebuild index fc94496b9273..3c34a84c0eba 100644 --- a/app-admin/conky/conky-1.19.7.ebuild +++ b/app-admin/conky/conky-1.19.8.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-3 BSD LGPL-2.1 MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 ~riscv sparc x86" IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql ncurses nvidia +portmon pulseaudio rss systemd test thinkpad @@ -30,10 +30,10 @@ COMMON_DEPEND=" curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) - imlib? ( media-libs/imlib2[X] ) + imlib? ( >=media-libs/imlib2-1.11.0[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) - lua-imlib? ( media-libs/imlib2[X] ) + lua-imlib? ( >=media-libs/imlib2-1.11.0[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) diff --git a/app-admin/conky/conky-1.19.6-r2.ebuild b/app-admin/conky/conky-1.21.3.ebuild index 780a97784f42..93048f66b5fd 100644 --- a/app-admin/conky/conky-1.19.6-r2.ebuild +++ b/app-admin/conky/conky-1.21.3.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( lua5-4 ) -PYTHON_COMPAT=( python{3_10,3_11} ) +PYTHON_COMPAT=( python3_{10,11,12} ) inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg @@ -14,21 +14,28 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-3 BSD LGPL-2.1 MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 ~riscv sparc x86" -IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib - intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd - mysql ncurses nvidia +portmon pulseaudio rss systemd test thinkpad - truetype wayland webserver wifi X xinerama xmms2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="apcupsd bundled-toluapp cmus colour-name-map curl doc extras hddtemp ical + iconv imlib intel-backlight iostats irc lua-cairo lua-cairo-xlib + lua-imlib lua-rsvg math moc mouse-events mpd mysql ncurses nvidia + +portmon pulseaudio rss systemd test thinkpad truetype wayland webserver + wifi X xinerama xinput xmms2" RESTRICT="!test? ( test )" +# Note: toluapp is bundled in conky since 1.11.2 +# Note: maintainer mode "-DMAINTAINER_MODE=yes" sets CMAKE_BUILD_TYPE Debug +# which creates debug symbols and enables "-DBUILD_TESTS" which also +# results in conky_core debug library getting installed + COMMON_DEPEND=" curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) - imlib? ( media-libs/imlib2[X] ) + imlib? ( >=media-libs/imlib2-1.11.0[X] ) irc? ( net-libs/libircclient ) - lua-cairo? ( x11-libs/cairo[X] ) - lua-imlib? ( media-libs/imlib2[X] ) + lua-cairo? ( x11-libs/cairo[X?] ) + lua-cairo-xlib? ( x11-libs/cairo[X] ) + lua-imlib? ( >=media-libs/imlib2-1.11.0[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) @@ -36,7 +43,6 @@ COMMON_DEPEND=" pulseaudio? ( media-libs/libpulse ) rss? ( dev-libs/libxml2 - net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) @@ -51,10 +57,11 @@ COMMON_DEPEND=" wifi? ( net-wireless/wireless-tools ) webserver? ( net-libs/libmicrohttpd:= ) X? ( - x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext + x11-libs/libXi + x11-libs/libX11 ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) @@ -77,6 +84,9 @@ DEPEND=" ) " BDEPEND=" + colour-name-map? ( + dev-util/gperf + ) doc? ( virtual/pandoc $(python_gen_any_dep ' @@ -102,12 +112,16 @@ python_check_deps() { REQUIRED_USE=" ${LUA_REQUIRED_USE} imlib? ( X ) - lua-cairo? ( X bundled-toluapp ) - lua-imlib? ( X bundled-toluapp ) - lua-rsvg? ( X bundled-toluapp ) + lua-cairo? ( || ( X wayland ) bundled-toluapp ) + lua-cairo-xlib? ( X bundled-toluapp ) + lua-imlib? ( X bundled-toluapp ) + lua-rsvg? ( || ( X wayland ) bundled-toluapp ) + mouse-events? ( X wayland ) nvidia? ( X ) + rss? ( curl ) truetype? ( X ) xinerama? ( X ) + xinput? ( X ) " CONFIG_CHECK="~IPV6" @@ -144,14 +158,13 @@ src_configure() { if use X; then mycmakeargs+=( - -DBUILD_ARGB=yes - -DBUILD_X11=yes + -DOWN_WINDOW=yes -DBUILD_XDAMAGE=yes - -DBUILD_XDBE=yes -DBUILD_XFIXES=yes + -DBUILD_ARGB=yes + -DBUILD_XDBE=yes -DBUILD_XSHAPE=yes - -DBUILD_MOUSE_EVENTS=yes - -DOWN_WINDOW=yes + -DBUILD_X11=yes ) else mycmakeargs+=( @@ -164,6 +177,7 @@ src_configure() { -DBUILD_AUDACIOUS=no -DBUILD_BUILTIN_CONFIG=yes -DBUILD_CMUS=$(usex cmus) + -DBUILD_COLOUR_NAME_MAP=$(usex colour-name-map) -DBUILD_CURL=$(usex curl) -DBUILD_DOCS=$(usex doc) -DBUILD_EXTRAS=$(usex extras) @@ -180,10 +194,12 @@ src_configure() { -DBUILD_IRC=$(usex irc) -DBUILD_JOURNAL=$(usex systemd) -DBUILD_LUA_CAIRO=$(usex lua-cairo) + -DBUILD_LUA_CAIRO_XLIB=$(usex lua-cairo-xlib) -DBUILD_LUA_IMLIB2=$(usex lua-imlib) -DBUILD_LUA_RSVG=$(usex lua-rsvg) -DBUILD_MATH=$(usex math) -DBUILD_MOC=$(usex moc) + -DBUILD_MOUSE_EVENTS=$(usex mouse-events) -DBUILD_MPD=$(usex mpd) -DBUILD_MYSQL=$(usex mysql) -DBUILD_NCURSES=$(usex ncurses) @@ -197,6 +213,7 @@ src_configure() { -DBUILD_WLAN=$(usex wifi) -DBUILD_XFT=$(usex truetype) -DBUILD_XINERAMA=$(usex xinerama) + -DBUILD_XINPUT=$(usex xinput) -DBUILD_XMMS2=$(usex xmms2) -DDOC_PATH=/usr/share/doc/${PF} -DMAINTAINER_MODE=no diff --git a/app-admin/conky/conky-1.21.4.ebuild b/app-admin/conky/conky-1.21.4.ebuild new file mode 100644 index 000000000000..93048f66b5fd --- /dev/null +++ b/app-admin/conky/conky-1.21.4.ebuild @@ -0,0 +1,251 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-4 ) +PYTHON_COMPAT=( python3_{10,11,12} ) + +inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg + +DESCRIPTION="An advanced, highly configurable system monitor for X" +HOMEPAGE="https://github.com/brndnmtthws/conky" +SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3 BSD LGPL-2.1 MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="apcupsd bundled-toluapp cmus colour-name-map curl doc extras hddtemp ical + iconv imlib intel-backlight iostats irc lua-cairo lua-cairo-xlib + lua-imlib lua-rsvg math moc mouse-events mpd mysql ncurses nvidia + +portmon pulseaudio rss systemd test thinkpad truetype wayland webserver + wifi X xinerama xinput xmms2" +RESTRICT="!test? ( test )" + +# Note: toluapp is bundled in conky since 1.11.2 +# Note: maintainer mode "-DMAINTAINER_MODE=yes" sets CMAKE_BUILD_TYPE Debug +# which creates debug symbols and enables "-DBUILD_TESTS" which also +# results in conky_core debug library getting installed + +COMMON_DEPEND=" + curl? ( net-misc/curl ) + ical? ( dev-libs/libical:= ) + iconv? ( virtual/libiconv ) + imlib? ( >=media-libs/imlib2-1.11.0[X] ) + irc? ( net-libs/libircclient ) + lua-cairo? ( x11-libs/cairo[X?] ) + lua-cairo-xlib? ( x11-libs/cairo[X] ) + lua-imlib? ( >=media-libs/imlib2-1.11.0[X] ) + lua-rsvg? ( gnome-base/librsvg ) + mysql? ( dev-db/mysql-connector-c ) + ncurses? ( sys-libs/ncurses:= ) + nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) + pulseaudio? ( media-libs/libpulse ) + rss? ( + dev-libs/libxml2 + dev-libs/glib:2 + ) + systemd? ( sys-apps/systemd ) + truetype? ( + x11-libs/libXft + >=media-libs/freetype-2 + ) + wayland? ( + dev-libs/wayland + x11-libs/pango + ) + wifi? ( net-wireless/wireless-tools ) + webserver? ( net-libs/libmicrohttpd:= ) + X? ( + x11-libs/libXdamage + x11-libs/libXfixes + x11-libs/libXext + x11-libs/libXi + x11-libs/libX11 + ) + xinerama? ( x11-libs/libXinerama ) + xmms2? ( media-sound/xmms2 ) + ${LUA_DEPS} +" +RDEPEND=" + ${COMMON_DEPEND} + apcupsd? ( sys-power/apcupsd ) + cmus? ( media-sound/cmus ) + hddtemp? ( app-admin/hddtemp ) + moc? ( media-sound/moc ) +" +DEPEND=" + ${COMMON_DEPEND} + test? ( + dev-cpp/catch + ) + wayland? ( + dev-libs/wayland-protocols + ) +" +BDEPEND=" + colour-name-map? ( + dev-util/gperf + ) + doc? ( + virtual/pandoc + $(python_gen_any_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + ') + ) + extras? ( + $(python_gen_any_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + ') + ) + wayland? ( dev-util/wayland-scanner ) +" + +python_check_deps() { + use doc || use extras || return 0 + python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" +} + +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + imlib? ( X ) + lua-cairo? ( || ( X wayland ) bundled-toluapp ) + lua-cairo-xlib? ( X bundled-toluapp ) + lua-imlib? ( X bundled-toluapp ) + lua-rsvg? ( || ( X wayland ) bundled-toluapp ) + mouse-events? ( X wayland ) + nvidia? ( X ) + rss? ( curl ) + truetype? ( X ) + xinerama? ( X ) + xinput? ( X ) +" + +CONFIG_CHECK="~IPV6" + +DOCS=( README.md AUTHORS ) + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS="You can find sample configurations at /usr/share/doc/${PF}. +To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking. + +There are pretty html docs available at https://conky.cc/. + +Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wiki/Conky" + +pkg_setup() { + linux-info_pkg_setup + lua-single_pkg_setup + if use doc || use extras; then + python-any-r1_pkg_setup + fi +} + +src_prepare() { + # pin lua 5.4 + sed -i -e 's|Lua "5.3" REQUIRED|Lua "5.4" EXACT|g' \ + cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake" + + cmake_src_prepare + xdg_environment_reset +} + +src_configure() { + local mycmakeargs=() + + if use X; then + mycmakeargs+=( + -DOWN_WINDOW=yes + -DBUILD_XDAMAGE=yes + -DBUILD_XFIXES=yes + -DBUILD_ARGB=yes + -DBUILD_XDBE=yes + -DBUILD_XSHAPE=yes + -DBUILD_X11=yes + ) + else + mycmakeargs+=( + -DBUILD_X11=no + ) + fi + + mycmakeargs+=( + -DBUILD_APCUPSD=$(usex apcupsd) + -DBUILD_AUDACIOUS=no + -DBUILD_BUILTIN_CONFIG=yes + -DBUILD_CMUS=$(usex cmus) + -DBUILD_COLOUR_NAME_MAP=$(usex colour-name-map) + -DBUILD_CURL=$(usex curl) + -DBUILD_DOCS=$(usex doc) + -DBUILD_EXTRAS=$(usex extras) + -DBUILD_HDDTEMP=$(usex hddtemp) + -DBUILD_HTTP=$(usex webserver) + -DBUILD_I18N=yes + -DBUILD_IBM=$(usex thinkpad) + -DBUILD_ICAL=$(usex ical) + -DBUILD_ICONV=$(usex iconv) + -DBUILD_IMLIB2=$(usex imlib) + -DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight) + -DBUILD_IOSTATS=$(usex iostats) + -DBUILD_IPV6=yes + -DBUILD_IRC=$(usex irc) + -DBUILD_JOURNAL=$(usex systemd) + -DBUILD_LUA_CAIRO=$(usex lua-cairo) + -DBUILD_LUA_CAIRO_XLIB=$(usex lua-cairo-xlib) + -DBUILD_LUA_IMLIB2=$(usex lua-imlib) + -DBUILD_LUA_RSVG=$(usex lua-rsvg) + -DBUILD_MATH=$(usex math) + -DBUILD_MOC=$(usex moc) + -DBUILD_MOUSE_EVENTS=$(usex mouse-events) + -DBUILD_MPD=$(usex mpd) + -DBUILD_MYSQL=$(usex mysql) + -DBUILD_NCURSES=$(usex ncurses) + -DBUILD_NVIDIA=$(usex nvidia) + -DBUILD_OLD_CONFIG=yes + -DBUILD_PORT_MONITORS=$(usex portmon) + -DBUILD_PULSEAUDIO=$(usex pulseaudio) + -DBUILD_RSS=$(usex rss) + -DBUILD_TESTS=$(usex test) + -DBUILD_WAYLAND=$(usex wayland) + -DBUILD_WLAN=$(usex wifi) + -DBUILD_XFT=$(usex truetype) + -DBUILD_XINERAMA=$(usex xinerama) + -DBUILD_XINPUT=$(usex xinput) + -DBUILD_XMMS2=$(usex xmms2) + -DDOC_PATH=/usr/share/doc/${PF} + -DMAINTAINER_MODE=no + -DRELEASE=yes + ) + + if use doc || use extras; then + mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use extras; then + insinto /usr/share/vim/vimfiles/ftdetect + doins "${S}"/extras/vim/ftdetect/conkyrc.vim + + insinto /usr/share/vim/vimfiles/syntax + doins "${BUILD_DIR}"/extras/vim/syntax/conkyrc.vim + + insinto /usr/share/nano/ + doins "${BUILD_DIR}"/extras/nano/conky.nanorc + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + xdg_pkg_postinst +} diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml index 2caf95af9ae7..c9e45a10223f 100644 --- a/app-admin/conky/metadata.xml +++ b/app-admin/conky/metadata.xml @@ -7,7 +7,7 @@ </maintainer> <upstream> <maintainer> - <email>brenden@rty.ca</email> + <email>brenden@brndn.io</email> <name>Brenden Matthews</name> </maintainer> <remote-id type="sourceforge">conky</remote-id> @@ -18,21 +18,25 @@ <flag name="apcupsd">Enable support for <pkg>sys-power/apcupsd</pkg></flag> <flag name="bundled-toluapp">Enable support for bundled toluapp. This only makes sense in combination with the lua-* flags</flag> <flag name="cmus">Enable monitoring of music played by <pkg>media-sound/cmus</pkg></flag> + <flag name="colour-name-map">Include mappings of colour name</flag> <flag name="extras">Enable syntax highlighting for <pkg>app-editors/nano</pkg>and app-editors/vim</flag> <flag name="ical">Enable support for events from iCalendar (RFC 5545) files using <pkg>dev-libs/libical</pkg></flag> <flag name="intel-backlight">Enable support for Intel backlight</flag> <flag name="iostats">Enable support for per-task I/O statistics</flag> <flag name="irc">Enable support for displaying everything from an irc channel using <pkg>net-libs/libircclient</pkg></flag> <flag name="lua-cairo">Enable if you want Lua Cairo bindings</flag> + <flag name="lua-cairo-xlib">Enable support for Cairo and Xlib interoperability for Lua</flag> <flag name="lua-imlib">Enable if you want Lua Imlib2 bindings</flag> <flag name="lua-rsvg">Enable if you want Lua RSVG bindings</flag> <flag name="math">Enable support for glibc's libm math library</flag> <flag name="moc">Enable monitoring of music played by <pkg>media-sound/moc</pkg></flag> + <flag name="mouse-events">Enable support for mouse events"</flag> <flag name="mpd">Enable monitoring of music controlled by <pkg>media-sound/mpd</pkg></flag> <flag name="nvidia">Enable reading of nvidia card temperature sensors via <pkg>x11-drivers/nvidia-drivers</pkg></flag> <flag name="portmon">Enable support for tcp (ip4) port monitoring</flag> <flag name="thinkpad">Enable support for IBM/Lenovo notebooks</flag> <flag name="webserver">Enable support to act as a webserver serving conkys output using <pkg>net-libs/libmicrohttpd</pkg></flag> <flag name="xmms2">Enable monitoring of music played by <pkg>media-sound/xmms2</pkg></flag> + <flag name="xinput">Enable support for Xinput 2 (slow)</flag> </use> </pkgmetadata> diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest index 1478714eb232..94b93a5de3bc 100644 --- a/app-admin/consul-template/Manifest +++ b/app-admin/consul-template/Manifest @@ -1,2 +1,2 @@ -DIST consul-template-0.29.4-deps.tar.xz 59446648 BLAKE2B 9ccd689f38eff50ad448a4226de918920c7acca9eb1e23d4e30f9999afc124224bb8f123b3dff4a1d433ea683ed523cd604a41472f50cb1919483040fc18c848 SHA512 3c60d88fdb82744f250cf02be3b3423f74360f18a43f4c4204ee97f73c370b878ecdbd5a300f96b74ffd9c7cde66f6c8b974392f7acc07a113b85ab6f1b6d8e9 -DIST consul-template-0.29.5.tar.gz 262722 BLAKE2B 1e3ddf259d76cf487872cebbe8c8b5bb313b89d073b26496340d39cc55c4e56ec531cbefec4bc1c0dd5c8bb3bd707c9bebfd15011e421badf12ea59a5bbbdbe3 SHA512 f753c2ec7f6c97ac73b34820b40568b5b16a3b8d4bebc7390905614a96744e8d4afd4a63b8b911989ba084ea91d85a21e3283d67a36bf65a685aa63154361a14 +DIST consul-template-0.37.4-deps.tar.xz 1548760 BLAKE2B 34a4e7926f41578071e60c715c534a8a50c49db3a78b06ae6ee49ed1a1c857faea753f27921cb6345bbc94f44ab81da58d3ffd1d27a0e29220bd2631bb35b58a SHA512 e28e29034407a5fbf78f9872b2cd85c0d6414cb5ec3c4b023b080c227583ae34ead6ab5b98c6ff4e1d278d9af137e895cedc79def10017d073f2b99561f1d483 +DIST consul-template-0.37.4.tar.gz 288565 BLAKE2B 69fc82a482c7fce4201621ee43aca689b328be4e34bb99e1cd552ba844787744a97fb64364adc7d9a180fd424d30881deaed45077851bc10fa037799ea99d189 SHA512 e36a5e444801c8700577df28fb3fbc7398b825d8f549d620c07445d86099a7597d0e95d56ce24daedd44eb573cc33e40dd1bb1e7a6def2c2a1788133bb811c38 diff --git a/app-admin/consul-template/consul-template-0.29.5.ebuild b/app-admin/consul-template/consul-template-0.37.4.ebuild index 6727d40a8f93..adf2f99b89be 100644 --- a/app-admin/consul-template/consul-template-0.29.5.ebuild +++ b/app-admin/consul-template/consul-template-0.37.4.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit go-module systemd DESCRIPTION="Generic template rendering and notifications with Consul" HOMEPAGE="https://github.com/hashicorp/consul-template" -SRC_URI="https://github.com/hashicorp/consul-template/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~zmedico/dist/consul-template-0.29.4-deps.tar.xz" +SRC_URI="https://github.com/hashicorp/consul-template/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2" +LICENSE="MPL-2.0" +LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2" SLOT="0" KEYWORDS="~amd64" diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest index 7d80f2efa108..9532d6fa5036 100644 --- a/app-admin/consul/Manifest +++ b/app-admin/consul/Manifest @@ -1,3 +1,5 @@ -DIST consul-1.15.10-vendor.tar.gz 46702348 BLAKE2B a04d6f5a4d2f6f8885207f9f72537d4ea1a3adc5aab64873edf7f710984d3b25a602fb93cecc44ed82249280b51bbe1131701ab09f7ebb1b444c80e013fe271d SHA512 7aade3f90ee689ddca3058f12e7c9f2a691c4eba966993d770d8dc7b171cad54c3c8b6c3f52e03128a8d1b159dd66b6c8b284050c5475d77b51f9a22c4a6af8a +DIST consul-1.15.11-deps.tar.xz 9566892 BLAKE2B 9459a93d78d3e4b991d0cdcfac22603c628c8f9fdacd8d50524a4c826cca66a575f6cd0bdf5fa9033e32b50336c53192567610ed73386f89c3c4e810c1412144 SHA512 d3876433b4ad3e7a062e059ef250bcfba23ede0595d8491f4b39c73c427e28c677b9f6e41317cf853ab8b3b2ce25151a4adf1a13b13a6a73c6e16de7382d2d05 +DIST consul-1.15.11.tar.gz 28951114 BLAKE2B 02378088d1bbc4313ec62d644b583c328bc9cc40ccc18516a1a14ae0d7f8d12007f1a5fa7c5e455ec2e782ba986ce60d37b92369b1f89f7dd69871702cd97b31 SHA512 1c5c8f9a3ad79aa34fd82a49e92ef5a21fb0470d60e3f3413901305121cbb677c75f72ffd5405554424b336d4e5ec426b7c35f458c04b1d5ab9350c2649cd688 DIST consul-1.15.3-vendor.tar.gz 43434721 BLAKE2B 7595c98cdecf67e9fb412d8fea1d790dc6b1c29f7bc427e1d0872045a05f8873dc6107f196cea04fe0a2f2553d4fbb1f8d501e5e107b2bea3ae841e5d94eda64 SHA512 b69e3a7c1ebb01c7a64f2c6167e63e8a530b81be9aad8b591d0a71f512f5157ba9a564b46f9effe52a5abd3ae61732e7af10c5ba002110f745eb3d94ebcec256 -DIST consul-1.15.7-vendor.tar.gz 46252048 BLAKE2B c63d69fb206895c535ffd60ada3589d99ec6aec81d7abe6b27169d4638bcc272f5d7c0b37d0bbe6be54f5e2d32f1e40fa1f4088da7fb4931f0c5c10007838197 SHA512 1e52f133f822cf11ee8498b7e92a7460c74d3ed4736c02e0957e3d950608f4aeaec8e8df7e9eb72ae7d4c31c4dcf5d827c9c42bdc7c4b991be53df22c150658a +DIST consul-1.18.1-deps.tar.xz 10161908 BLAKE2B da7e3e63470f082bf0f1e92252a2d30cce90c4268e5ad3d180ab4bfed6601e92e26e0a108fe7477a1d596cf44114e97551712bce4c2b3d13c06c3fae0fa948e5 SHA512 f0d3961de4c38052209d79817ba6570fc43f3b9c472c959d591cc8fd23029f32070a98c59c70c02f56b80c214ae60d4a2711ca2ec31472758209538ba00ef786 +DIST consul-1.18.1.tar.gz 34424463 BLAKE2B 1c205471fa5d2500e4421eae37159dc3a3f8ebb46ab50266440302ca814834d39fddf0c27f4da5e78a103a2d7411eebf74bd256153b3954c6bc3c384de660a2f SHA512 023ee6f2dff82343f9c3382b531c8fa7f032e1820e09d18f67201c8ae839dfc89b145a8197be2f9c241709541a915a073dd117f5523e17ba0cdaa665bffc2f4c diff --git a/app-admin/consul/consul-1.15.10.ebuild b/app-admin/consul/consul-1.15.11.ebuild index 7fbf1eb317a7..f0597622b535 100644 --- a/app-admin/consul/consul-1.15.10.ebuild +++ b/app-admin/consul/consul-1.15.11.ebuild @@ -6,11 +6,12 @@ inherit go-module systemd DESCRIPTION="A tool for service discovery, monitoring and configuration" HOMEPAGE="https://www.consul.io" -GIT_COMMIT="a8dca2405236750fc23fb31dac21507882d111f6" +GIT_COMMIT="4fc94919996f7b7e5d16145f8d89cc5ee644b094" -SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz" - -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" +SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" +LICENSE="BUSL-1.1 MPL-2.0" +LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" RESTRICT="test" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" @@ -22,11 +23,11 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" -S=${WORKDIR}/${P}-vendor +S=${WORKDIR}/${P} src_prepare() { default - sed -e 's|^GIT_DATE=.*|GIT_DATE=2023-10-31T14:10:44Z|' -i GNUmakefile || die + sed -e 's|^GIT_DATE=.*|GIT_DATE=2024-03-26T21:43:41Z|' -i GNUmakefile || die } src_compile() { diff --git a/app-admin/consul/consul-1.15.7.ebuild b/app-admin/consul/consul-1.18.1.ebuild index 2b693c361655..08991b0221e7 100644 --- a/app-admin/consul/consul-1.15.7.ebuild +++ b/app-admin/consul/consul-1.18.1.ebuild @@ -6,14 +6,15 @@ inherit go-module systemd DESCRIPTION="A tool for service discovery, monitoring and configuration" HOMEPAGE="https://www.consul.io" -GIT_COMMIT="8e803db6b98d10b2d310800f2aef7e20d3add03c" +GIT_COMMIT="98cb473cc11f2de0ccb61106381b0c7e92819c58" -SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz" - -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" -RESTRICT="test" +SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" +LICENSE="BUSL-1.1 MPL-2.0" +LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +RESTRICT="test" +KEYWORDS="amd64 ~arm64 ~x86" BDEPEND="dev-go/gox" COMMON_DEPEND=" @@ -22,11 +23,9 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" -S=${WORKDIR}/${P}-vendor - src_prepare() { default - sed -e 's|^GIT_DATE=.*|GIT_DATE=2023-10-31T14:10:44Z|' -i GNUmakefile || die + sed -e 's|^GIT_DATE=.*|GIT_DATE=2024-03-26T21:59:08Z|' -i Makefile || die } src_compile() { diff --git a/app-admin/cpulimit/Manifest b/app-admin/cpulimit/Manifest index 09487a44a762..43428a8a53d0 100644 --- a/app-admin/cpulimit/Manifest +++ b/app-admin/cpulimit/Manifest @@ -1 +1,2 @@ DIST cpulimit-2.8.tar.gz 24860 BLAKE2B 6d4002d2cbc46da9ce102da77b701e6a99c2e7d16e2e7989baa1e07ef335b126a8c717c4779d121aee1e580ebf057a16b4f83c1bc6a29c904a7532debc4c490a SHA512 aeb121739a5dc9f94c6ddb0905ed05eb7d146c9d0e71c34ba46aad798bda2c30b7ccc548338b4c468f9885f09d97a4565c00199c8df6af74dc9b6f23940c540e +DIST cpulimit-3.1.tar.gz 25446 BLAKE2B 77a7ca7dfbcb49f1db481e937607bfa3e287b944d741409033e0a93d2ec788024c30e4de0dc9270645dbd91a66b88db3ddc8763b41f2117b4176bb0f9c2aed5d SHA512 d4c8a2598535ba1221e2089c21576062eff47fe7e842f021e1db83ebdf7ad98ba7d6b216d4f2a93697d4e0adc54c281d24eded7d67bb83134ce06510e1389cda diff --git a/app-admin/cpulimit/cpulimit-2.8.ebuild b/app-admin/cpulimit/cpulimit-2.8.ebuild index 713b9c1decb1..1229deee0b00 100644 --- a/app-admin/cpulimit/cpulimit-2.8.ebuild +++ b/app-admin/cpulimit/cpulimit-2.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Limits the CPU usage of a process" HOMEPAGE="https://cpulimit.sourceforge.net" -SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/limitcpu/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/app-admin/cpulimit/cpulimit-3.1.ebuild b/app-admin/cpulimit/cpulimit-3.1.ebuild new file mode 100644 index 000000000000..8f369c8795a2 --- /dev/null +++ b/app-admin/cpulimit/cpulimit-3.1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Limits the CPU usage of a process" +HOMEPAGE="https://cpulimit.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/limitcpu/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~riscv ~x86" + +PATCHES=( + "${FILESDIR}/${P}-makefile.patch" +) + +src_compile() { + emake CC=$(tc-getCC) +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + dodoc CHANGELOG README +} diff --git a/app-admin/cpulimit/files/cpulimit-3.1-makefile.patch b/app-admin/cpulimit/files/cpulimit-3.1-makefile.patch new file mode 100644 index 000000000000..7daf8a7092ab --- /dev/null +++ b/app-admin/cpulimit/files/cpulimit-3.1-makefile.patch @@ -0,0 +1,25 @@ +--- a/Makefile 2023-02-06 18:47:21.311693323 +0300 ++++ b/Makefile 2023-02-06 18:48:23.392517904 +0300 +@@ -2,6 +2,7 @@ + PREFIX?=/usr + CFLAGS?=-Wall -O2 + CC?=clang ++DESTDIR= + + all: cpulimit + +@@ -21,10 +22,10 @@ + $(MAKE) -C test + + install: cpulimit +- mkdir -p ${PREFIX}/bin +- mkdir -p ${PREFIX}/share/man/man1 +- cp cpulimit ${PREFIX}/bin +- cp cpulimit.1 ${PREFIX}/share/man/man1 ++ mkdir -p ${DESTDIR}/${PREFIX}/bin ++ mkdir -p ${DESTDIR}/${PREFIX}/share/man/man1 ++ cp cpulimit ${DESTDIR}/${PREFIX}/bin ++ cp cpulimit.1 ${DESTDIR}/${PREFIX}/share/man/man1 + + deinstall: + rm -f ${PREFIX}/bin/cpulimit diff --git a/app-admin/cpulimit/metadata.xml b/app-admin/cpulimit/metadata.xml index 2f011b11fe67..301d5fbb3d91 100644 --- a/app-admin/cpulimit/metadata.xml +++ b/app-admin/cpulimit/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">limitcpu</remote-id> </upstream> diff --git a/app-admin/cronlocker/metadata.xml b/app-admin/cronlocker/metadata.xml index db463f3eeb66..5e93affc2408 100644 --- a/app-admin/cronlocker/metadata.xml +++ b/app-admin/cronlocker/metadata.xml @@ -5,4 +5,7 @@ <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> + <upstream> + <remote-id type="github">viafintech/cronlocker</remote-id> + </upstream> </pkgmetadata> diff --git a/app-admin/cronolog/cronolog-1.6.2-r7.ebuild b/app-admin/cronolog/cronolog-1.6.2-r7.ebuild index 32788154300e..a2bcdadc827c 100644 --- a/app-admin/cronolog/cronolog-1.6.2-r7.ebuild +++ b/app-admin/cronolog/cronolog-1.6.2-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="http://cronolog.org/download/${P}.tar.gz" LICENSE="GPL-2+ Apache-1.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ppc x86" PATCHES=( "${FILESDIR}"/${PV}-patches diff --git a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r2.ebuild index baf5e9023c3a..2a5bb8a3b82e 100644 --- a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild +++ b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 diff --git a/app-admin/drush/drush-6.7.0-r6.ebuild b/app-admin/drush/drush-6.7.0-r6.ebuild index d2eeb415631c..4f0d63ad593b 100644 --- a/app-admin/drush/drush-6.7.0-r6.ebuild +++ b/app-admin/drush/drush-6.7.0-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,9 +12,7 @@ SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" -DEPEND="" RDEPEND="dev-lang/php[cli,ctype,json(+),simplexml] dev-php/PEAR-Console_Table" diff --git a/app-admin/drush/drush-6.7.0-r4.ebuild b/app-admin/drush/drush-6.7.0-r7.ebuild index 888cfc09e2bd..1329345e4dc0 100644 --- a/app-admin/drush/drush-6.7.0-r4.ebuild +++ b/app-admin/drush/drush-6.7.0-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,10 +11,8 @@ SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" +KEYWORDS="~amd64 ~x86" -DEPEND="" RDEPEND="dev-lang/php[cli,ctype,json(+),simplexml] dev-php/PEAR-Console_Table" @@ -23,6 +21,8 @@ PATCHES=( "${FILESDIR}/array-syntax.patch" "${FILESDIR}/${P}-php8.0.patch" "${FILESDIR}/${P}-gzip-mime.patch" + "${FILESDIR}/${P}-dont-pass-null-to-strtoupper.patch" + "${FILESDIR}/${P}-batch-signature-fix-r1.patch" ) src_prepare() { diff --git a/app-admin/drush/files/drush-6.7.0-batch-signature-fix-r1.patch b/app-admin/drush/files/drush-6.7.0-batch-signature-fix-r1.patch new file mode 100644 index 000000000000..14ee72b7dc4a --- /dev/null +++ b/app-admin/drush/files/drush-6.7.0-batch-signature-fix-r1.patch @@ -0,0 +1,46 @@ +From 1acd52cff0d516ebfa7f177c38ed7f851c4f472a Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 16 Aug 2023 21:21:39 -0400 +Subject: [PATCH] includes/batch.inc: synchronize sub and superclass signatures + +The DrushBatchContext class overrides the offsetSet() method of its +superclass, ArrayObject, but changes its signature: + + Error: Return type of DrushBatchContext::offsetSet($name, $value) + should either be compatible with ArrayObject::offsetSet(mixed $key, + mixed $value): void, or the #[\ReturnTypeWillChange] attribute should + be used to temporarily suppress the notice in .../batch.inc, line 37 + +Renaming the parameter to $key and adding type hints fixes the issue. + +Signed-off-by: Michael Orlitzky <michael@orlitzky.com> +--- + includes/batch.inc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/includes/batch.inc b/includes/batch.inc +index dd4adc9..d26fabb 100644 +--- a/includes/batch.inc ++++ b/includes/batch.inc +@@ -34,14 +34,14 @@ + * @see _drush_batch_worker(). + */ + class DrushBatchContext extends ArrayObject { +- function offsetSet($name, $value) { +- if ($name == 'message') { ++ function offsetSet(mixed $key, mixed $value): void { ++ if ($key == 'message') { + drush_log(strip_tags($value), 'ok'); + } +- elseif ($name == 'error_message') { ++ elseif ($key == 'error_message') { + drush_set_error('DRUSH_BATCH_ERROR', strip_tags($value)); + } +- parent::offsetSet($name, $value); ++ parent::offsetSet($key, $value); + } + } + +-- +2.43.2 + diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest index 6f1c08679920..fd7c3d41d94f 100644 --- a/app-admin/eclean-kernel/Manifest +++ b/app-admin/eclean-kernel/Manifest @@ -1 +1 @@ -DIST eclean_kernel-2.99.7.tar.gz 25393 BLAKE2B 74f803f1007a1c54d87f087287a34a8380b21b9c66ad75a0ae64463815d5df39de0387f5d0cfd366e33efdaf039fce5dad923f1e55f93a2836830e303c3ca2df SHA512 dd43f65c1beebef59ee7a2e41375797fa5ea77171d8e4cf465b2b6a46e8e4500fb1723f664f2ce59e5b6e79d2dedd4abbaaa303a77e8349b9ee90c56e00e799e +DIST eclean_kernel-2.99.8.tar.gz 25134 BLAKE2B efd29370f0204c8df7a8e955a50ef8ad819fd29f8cbf1d179e61588130ac6d589366f1f76d499cae42c6e99c553d1b0cd68c4f0728315940b5997196bda6b57c SHA512 57956e1f93327db86942c5be815d3df61934f93a65349faca4d2605e7667b9dfe8e42bc6d4f5c5c27fbbdd536a25371b4c4b0b88dca92ba0f5f98058f1c1b679 diff --git a/app-admin/eclean-kernel/eclean-kernel-2.99.7.ebuild b/app-admin/eclean-kernel/eclean-kernel-2.99.8.ebuild index 7829c8eaafb0..d5d222851c21 100644 --- a/app-admin/eclean-kernel/eclean-kernel-2.99.7.ebuild +++ b/app-admin/eclean-kernel/eclean-kernel-2.99.8.ebuild @@ -14,12 +14,13 @@ HOMEPAGE=" https://pypi.org/project/eclean-kernel/ " -LICENSE="BSD" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~arm64 ~riscv x86" IUSE="lz4 lzo zstd" RDEPEND=" + dev-python/distro[${PYTHON_USEDEP}] kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] ) lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] ) diff --git a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild index 993e9658085c..5f9082c69fdb 100644 --- a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild +++ b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,15 +9,18 @@ PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 git-r3 DESCRIPTION="Remove outdated built kernels" -HOMEPAGE="https://github.com/projg2/eclean-kernel/" +HOMEPAGE=" + https://github.com/projg2/eclean-kernel/ + https://pypi.org/project/eclean-kernel/ +" EGIT_REPO_URI="https://github.com/projg2/eclean-kernel.git" -LICENSE="BSD" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="" IUSE="lz4 lzo zstd" RDEPEND=" + dev-python/distro[${PYTHON_USEDEP}] kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] ) lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] ) diff --git a/app-admin/emacs-updater/Manifest b/app-admin/emacs-updater/Manifest index 64b82fca614e..31a0f0155373 100644 --- a/app-admin/emacs-updater/Manifest +++ b/app-admin/emacs-updater/Manifest @@ -1 +1 @@ -DIST emacs-updater-1.17.tar.xz 7236 BLAKE2B f39a19eba794cd57b25fbfc38998775a7818d98c81bbbdf485b33ed273815dfb3a74c26ca410f0e3b8e4bd46f2114b96155485cdcf87d5bec70a96dfe1a3a279 SHA512 461f496075bd7fc057290d40d408e5243ec464d8814abbe0c47c77a223b314ba2bcc35e20bf5e22e6dcee485a024ab93ced7155fa5212bc2d9c3b6362f168c52 +DIST emacs-updater-1.18.tar.xz 7360 BLAKE2B ff890584349d87a9cdcfe4576dd3bb1f8fc73b6cb086a5dd09fef3c8bf500a519f1aab810321680a5f5d4f1093455a6c54db42d900ee50fc39fcc03f0d6db69e SHA512 15c3b6e5ea7d1935a7e472d75409c0cb0dc9658142c1270a4a487eba822dbcd3ac32ffe60cb501859a7ccb7441efa1c7dd5d3a6cf481f69a583c5c8d5001051a diff --git a/app-admin/emacs-updater/emacs-updater-1.17.ebuild b/app-admin/emacs-updater/emacs-updater-1.18.ebuild index 193e60a52c26..5c3df85ff7ea 100644 --- a/app-admin/emacs-updater/emacs-updater-1.17.ebuild +++ b/app-admin/emacs-updater/emacs-updater-1.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest index 4d3e78c93ae2..db19310fb362 100644 --- a/app-admin/entr/Manifest +++ b/app-admin/entr/Manifest @@ -1 +1,2 @@ DIST entr-5.5.tar.gz 21225 BLAKE2B 8a160894220b63c510fe432a033ba7770e8811da4c5d642391a61a11ca1865293675bc3adbb505b70da9d01b258c27770bc07fad18de7a993e172b2b1214df9b SHA512 5150744142cf1639289c2d845cf8cd3cbc0ef57fce8285bc0e2908c430d8344659ff064810e175e69bd8a6f06144734b2efa4d733e0fba7fec83a1f48d053a0d +DIST entr-5.6.tar.gz 23370 BLAKE2B 52b2e2d49d550c7ba82199cc70500598c50809136bc9bed881174ab59806802ac09cf7ff32f0476eeb66ee9fdb87bef72dbf28bfd4495f0301ee80809800dbfa SHA512 9c65449b6fd7e172fde23a6d4d776b6fdbcec210ef54234db0af056e481acd11f53f9b25432a278435943bd998be734fcd997b5debdcace58112ac99d103f653 diff --git a/app-admin/entr/entr-5.6.ebuild b/app-admin/entr/entr-5.6.ebuild new file mode 100644 index 000000000000..e7f905243699 --- /dev/null +++ b/app-admin/entr/entr-5.6.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo toolchain-funcs + +DESCRIPTION="Run arbitrary commands when files change" +HOMEPAGE=" + https://eradman.com/entrproject/ + https://github.com/eradman/entr +" +SRC_URI="https://eradman.com/entrproject/code/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + app-alternatives/awk[gawk] + app-editors/vim + app-misc/tmux + dev-vcs/git + sys-apps/file + ) +" + +src_configure() { + tc-export CC + export PREFIX="${EPREFIX}/usr" + export SHELL="${BROOT}/bin/bash" + export TMUX_TMPDIR="${T}" + + edo ./configure +} diff --git a/app-admin/entr/metadata.xml b/app-admin/entr/metadata.xml index 431bdd3e3d24..82225571628c 100644 --- a/app-admin/entr/metadata.xml +++ b/app-admin/entr/metadata.xml @@ -5,10 +5,6 @@ <email>arkamar@gentoo.org</email> <name>Petr Vaněk</name> </maintainer> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> <maintainer type="project"> <email>shell-tools@gentoo.org</email> <name>Gentoo Shell Tools Project</name> diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest index 142df76c673a..b8336f9302ca 100644 --- a/app-admin/exo/Manifest +++ b/app-admin/exo/Manifest @@ -1 +1 @@ -DIST exo-1.76.0.gh.tar.gz 10892774 BLAKE2B 836aeb6442e9d30d26d9e4e817de42b01d54e739ec77f90ff683d9a2e33830593ae5c0b828267b52f87b451e8ff7b1a207fa60c89c5443adef3e2efb5f6321ab SHA512 861ac2b2a2bbeb7d0b3cc829d2399be1f57b500656a178692b1d73ff78cdaa784c87c775061eedaf28eace68754935b855c4e927133b298b01f3bf79fa4b6675 +DIST exo-1.78.4.gh.tar.gz 11118919 BLAKE2B cae6863c14d54363973491cb08a628abe24043ad8ae81aaf712c0b3ddf6c2037aca0f9b9e6a8323695558011999a0022fd151dcfb7df38409d0dfead58b9b7b8 SHA512 334ac58e899c40faed197cc11ae234ee3f8226bf51feb7bb552169710ffecababe469994d6096f5367edb424d5ccd0ac6521ff8fd83c521b9397196dd72d4cf6 diff --git a/app-admin/exo/exo-1.76.0.ebuild b/app-admin/exo/exo-1.78.4.ebuild index 832c2c26b861..43fbacd8aa32 100644 --- a/app-admin/exo/exo-1.76.0.ebuild +++ b/app-admin/exo/exo-1.78.4.ebuild @@ -3,23 +3,22 @@ EAPI=8 +inherit go-module + DESCRIPTION="Command-line tool for everything at Exoscale: compute, storage, dns" HOMEPAGE="https://github.com/exoscale/cli" SRC_URI="https://github.com/exoscale/cli/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/cli-${PV}" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64" -IUSE="" DEPEND=">=dev-lang/go-1.16:=" RESTRICT="strip" -QA_FLAGS_IGNORED=".*" - -S="${WORKDIR}/cli-${PV}" src_compile() { - go build -mod vendor -o ${PN} -ldflags "-X main.version=${PVR}-gentoo -X main.commit=" || die "build failed" + ego build -mod vendor -o ${PN} -ldflags "-X main.version=${PVR}-gentoo -X main.commit=" } src_test() { diff --git a/app-admin/fetchlog/fetchlog-1.4-r2.ebuild b/app-admin/fetchlog/fetchlog-1.4-r2.ebuild index 5602f38821e8..3fea9eea853b 100644 --- a/app-admin/fetchlog/fetchlog-1.4-r2.ebuild +++ b/app-admin/fetchlog/fetchlog-1.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Displays the last new messages of a logfile" HOMEPAGE="https://fetchlog.sourceforge.net/" -SRC_URI="mirror://sourceforge/fetchlog/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/fetchlog/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/app-admin/fifo-cronolog/Manifest b/app-admin/fifo-cronolog/Manifest index ba3b49b49b23..959d598d56fb 100644 --- a/app-admin/fifo-cronolog/Manifest +++ b/app-admin/fifo-cronolog/Manifest @@ -1 +1 @@ -DIST fifo-cronolog-1.1.1.tar.bz2 3124 BLAKE2B 6e9cb35e0ed1b54c3baed4451742840dc1144294fc675822c1260d4d7d885a52f8835e60dcbed57c714e40e94e6d51b3ba78af9b9892883f5f520a7c57d30df8 SHA512 3ac809d5cfc951764aaf31d50ee394b0dde9ced16f53daa91c81bdb218af2bab410ff945ebfdeb8307a55bda3292c0a55eb500c3cb73595e17228ef739455d90 +DIST fifo-cronolog-1.2.3.tar.gz 4518 BLAKE2B c227304d98b2467a1ed7352399b1e53aba4dc005fa30a1be73b8cc96d61ee49d5f6a3703ccddd1ffef652c4090e9b5dfed9cce3f1254b959a1ccc07aac78b3f6 SHA512 557be1a663c5754a293092078b8a3710474bb1939c1ee65e4c560056238ca646e941e4ad82c0a90c02834fc90ddb2aae9047a4e73d42cf8c2c013f2a5d2c839c diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3-r1.ebuild index 1a34cb0f1110..27cfe32f20a1 100644 --- a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild +++ b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3-r1.ebuild @@ -3,9 +3,11 @@ EAPI=8 +inherit systemd + DESCRIPTION="cronolog wrapper for use with dumb daemons like squid, varnish and so on" -HOMEPAGE="https://cgit.gentoo.org/proj/fifo-cronolog.git" -SRC_URI="mirror://gentoo/${P}.tar.bz2" +HOMEPAGE="https://gitweb.gentoo.org/proj/fifo-cronolog.git" +SRC_URI="http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz" LICENSE="BSD-2 GPL-2" SLOT="0" @@ -13,13 +15,20 @@ KEYWORDS="~amd64 ~x86" RDEPEND="app-admin/cronolog" +src_compile() { + emake all +} + src_install() { dosbin fifo-cronolog + dosym fifo-cronolog /usr/sbin/squid-cronolog + dosbin fifo-cronolog-setup - newinitd fifo-cronolog.initd fifo-cronolog - newconfd fifo-cronolog.confd fifo-cronolog + newinitd openrc/fifo-cronolog.initd fifo-cronolog + newconfd openrc/fifo-cronolog.confd fifo-cronolog - dosym fifo-cronolog /usr/sbin/squid-cronolog + systemd_dounit systemd/fifo-cronolog@.service + dodoc README.md systemd/fifo-cronolog@example.service.env } pkg_postinst() { diff --git a/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild b/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild index 950b9a0df02f..16e4b94d13de 100644 --- a/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild +++ b/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="File control configuration system and IDS" HOMEPAGE="https://sourceforge.net/projects/filewatcher/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/app-admin/fsvs/Manifest b/app-admin/fsvs/Manifest index a72a447762d0..d9fc74121773 100644 --- a/app-admin/fsvs/Manifest +++ b/app-admin/fsvs/Manifest @@ -1 +1,2 @@ DIST fsvs-1.2.11.tar.gz 498514 BLAKE2B 8683fe3c22a0ea0d4762d631e520596dc02d69059f4ff5d8719bd44405134e5b5100c594a260d1b55a9dd7c6d240a84a0c5e05a18006a7a5f193ce76178d934c SHA512 72f883dfef85cb8aeb4d3baf3a2de5bfb6b5479273027f86b52edfdd2ea6dac4b2271b83a9879add3d7c9008f80a2fef13671b9e5ed61958c72ff144d9fad086 +DIST fsvs-1.2.12.tar.gz 526284 BLAKE2B db0a9f7cd60db7544ca44e4404c2ca844e035a8bb6db61d1880b19b26114f5c1c545b7d74e2e407d4a5961225d700851aaa95f3a6e395a5d9e92d21ade9ba0be SHA512 a06e6d6de242dfe117d3e2b1f18d117b77350ed2d398370d198110fc074dd352bac956acc2870586477cc6d2db404fefc5a5bcca3884cdd1477020f4297c1a81 diff --git a/app-admin/fsvs/files/fsvs-1.2.12-makefile.patch b/app-admin/fsvs/files/fsvs-1.2.12-makefile.patch new file mode 100644 index 000000000000..ff4969d58146 --- /dev/null +++ b/app-admin/fsvs/files/fsvs-1.2.12-makefile.patch @@ -0,0 +1,68 @@ +--- a/Makefile ++++ b/Makefile +@@ -13,7 +13,7 @@ + @echo '' + @false + +-configure: configure.in ++configure: configure.ac + @echo Generating configure. + autoconf + +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -11,10 +11,11 @@ + ################################ Definitions ################################ + DIR := /usr/share/doc + +-VERSION := $(shell git describe --tags --always) ++VERSION := 1.2.12 + ++CC := @CC@ + CFLAGS := @CFLAGS@ +-CFLAGS += -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"' -Wno-deprecated-declarations ++CFLAGS += -Wall -funsigned-char -DFSVS_VERSION='"$(VERSION)"' -Wno-deprecated-declarations + LDFLAGS := @LDFLAGS@ + FSVS_LDFLAGS = $(LDFLAGS) + BASELIBS := -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre2-8 -lgdbm -ldl +@@ -48,11 +49,7 @@ + + + ################################ Targets ################################### +-ifeq (@CHROOTER_JAIL@, ) +-all: deps tags check-version check-dox $(DEST) lsDEST +-else +-all: tools/fsvs-chrooter +-endif ++all: fsvs + + + check-version: config.h fsvs.c +@@ -145,18 +142,11 @@ + + + ################################ Rules ###################################### +-%.o: %.c +- @echo " CC $<" +- @$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + + # if the Makefile has changed, the output will (at least sometimes) + # change, too. + $(DEST): $(C_FILES:%.c=%.o) +- @echo " Link $@" +- @$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) -o $@ $^ $(BASELIBS) $(EXTRALIBS) +-ifeq (@ENABLE_RELEASE@, 1) +- -strip $@ +-endif ++ $(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) -o $@ $^ $(BASELIBS) $(EXTRALIBS) + + + # For debugging: generate preprocessed, generate assembler +@@ -171,7 +161,6 @@ + .%.d: %.c + @echo " deps for $<" + @$(CC) $(CPPFLAGS) $(CFLAGS) -MM $< | perl -pe 's#\bdoc.g-c\b##' > $@ +-include $(D_FILES) + + tools/fsvs-chrooter: tools/fsvs-chrooter.c + tools/fsvs-chrooter: interface.h config.h diff --git a/app-admin/fsvs/fsvs-1.2.12.ebuild b/app-admin/fsvs/fsvs-1.2.12.ebuild new file mode 100644 index 000000000000..c136006d7b06 --- /dev/null +++ b/app-admin/fsvs/fsvs-1.2.12.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Backup/restore for subversion backends" +HOMEPAGE="https://github.com/phmarek/fsvs" +SRC_URI="https://github.com/phmarek/fsvs/archive/refs/tags/${P}.tar.gz" +S="${WORKDIR}/fsvs-${P}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-libs/apr-util + dev-libs/libpcre + dev-util/ctags + dev-vcs/subversion + sys-libs/db:* + sys-libs/gdbm" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) + +src_prepare() { + default + eautoreconf +} + +src_install() { + dobin src/fsvs + dodir /etc/fsvs + keepdir /var/spool/fsvs + doman doc/*5 doc/*1 + dodoc doc/{FAQ,IGNORING,PERFORMANCE,USAGE} +} + +pkg_postinst() { + elog "Remember, this system works best when you're connecting to a remote" + elog "svn server." + elog + elog "Go to the base path for versioning:" + elog " cd /" + elog "Tell fsvs which URL it should use:" + elog " fsvs url svn+ssh://username@machine/path/to/repos" + elog "Define ignore patterns - all virtual filesystems (/proc, /sys, etc.)," + elog "and (assuming that you're in / currently) the temporary files in /tmp:" + elog " fsvs ignore DEVICE:0 ./tmp/*" + elog "And you're ready to play!" + elog "Check your data in:" + elog " fsvs commit -m \"First import\"" +} diff --git a/app-admin/genromfs/Manifest b/app-admin/genromfs/Manifest index d0b58fcae0c3..238354d2c851 100644 --- a/app-admin/genromfs/Manifest +++ b/app-admin/genromfs/Manifest @@ -1 +1,2 @@ -DIST genromfs-0.5.2.tar.gz 21069 BLAKE2B 350ebf11b8ef068053217b75ac995af1199e4c4c11823df584e8169c260dbd851d4f44ba6d23ac1f5f4cd9c2ca7ae7fd268d02ba19529da90003a697efc3e06a SHA512 7fa2f362e4a61ab38f5262fc5a716119312d3029f93cf0a514313c5a3c956d687d777a826da2f4ad95edaf5eab014464635b0afbaaa11f9b495efb6f03fbec2f +DIST genromfs-0.5.2.gh.tar.gz 21122 BLAKE2B 64e1a650ef52b7931036bb6e1585a01ef0cb9c687c91a882c25e20f21a5d4ddb2178319890ee906b25a6c3f6f09174eaec89a73cacda8077f048a957a23d101c SHA512 e0b1313f66088f145ffd894e6fa4def8ca99ef7475931457b3fa1242aed7eff6d001bb15f9ce75a3da8122bd2f99d20859d7f88fbb303764f6c20e24ce5a0e71 +DIST genromfs-0.5.7.gh.tar.gz 27929 BLAKE2B df556a3f4247ad12b441b245046177e56aca1460e92614528ced0c8f7b4df45ed3023d325d5140cc5e13a6f3187d4ee9143c33a9d25830c27a8d6c6b98ba741f SHA512 a37bbea5f7952194a417359f0a5d13f86d8ed3f75459281e4bd06a96a05840e5580a6d706342ddbd6e064e885b7991e636c7d638bf95e372a51abfcec7eb3c58 diff --git a/app-admin/genromfs/files/genromfs-0.5.7-build.patch b/app-admin/genromfs/files/genromfs-0.5.7-build.patch new file mode 100644 index 000000000000..f35b59e49cc6 --- /dev/null +++ b/app-admin/genromfs/files/genromfs-0.5.7-build.patch @@ -0,0 +1,28 @@ +--- a/Makefile ++++ b/Makefile +@@ -5,9 +5,10 @@ + + PACKAGE = genromfs + VERSION = 0.5.7 +-CC = gcc +-CFLAGS = -O2 -Wall -DVERSION=\"$(VERSION)\"#-g# +-LDFLAGS = -s#-g ++CC ?= gcc ++CFLAGS ?= -O2 ++CFLAGS += -Wall -DVERSION=\"$(VERSION)\"#-g# ++LDFLAGS ?= -s#-g + + DISTDIR = $(PACKAGE)-$(VERSION) + +@@ -17,9 +18,9 @@ + checkdist \ + .gitignore selftest + +-prefix = /usr ++prefix = $(DESTDIR)/usr + bindir = $(prefix)/bin +-mandir = $(prefix)/man ++mandir = $(prefix)/share/man + + genromfs: genromfs.o + $(CC) $(LDFLAGS) genromfs.o -o genromfs diff --git a/app-admin/genromfs/genromfs-0.5.2.ebuild b/app-admin/genromfs/genromfs-0.5.2.ebuild index 66652e4daaf2..112795eb371c 100644 --- a/app-admin/genromfs/genromfs-0.5.2.ebuild +++ b/app-admin/genromfs/genromfs-0.5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,8 @@ inherit toolchain-funcs DESCRIPTION="Create space-efficient, small, read-only romfs filesystems" HOMEPAGE="https://romfs.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/chexum/${PN}/archive/refs/tags/${PV}.tar.gz + -> ${P}.gh.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/app-admin/genromfs/genromfs-0.5.7.ebuild b/app-admin/genromfs/genromfs-0.5.7.ebuild new file mode 100644 index 000000000000..6415bb3bb4c5 --- /dev/null +++ b/app-admin/genromfs/genromfs-0.5.7.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Create space-efficient, small, read-only romfs filesystems" +HOMEPAGE="https://romfs.sourceforge.net/" +SRC_URI="https://github.com/chexum/${PN}/archive/refs/tags/${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~s390 ~x86" + +PATCHES=( "${FILESDIR}"/${P}-build.patch ) + +DOCS=( ChangeLog NEWS genromfs.lsm genrommkdev readme-kernel-patch romfs.txt ) + +src_compile() { + tc-export CC + default +} diff --git a/app-admin/genromfs/metadata.xml b/app-admin/genromfs/metadata.xml index caded186c5d3..0de3a697cece 100644 --- a/app-admin/genromfs/metadata.xml +++ b/app-admin/genromfs/metadata.xml @@ -4,5 +4,6 @@ <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">genromfs</remote-id> + <remote-id type="github">chexum/genromfs</remote-id> </upstream> </pkgmetadata> diff --git a/app-admin/git-credential-gopass/Manifest b/app-admin/git-credential-gopass/Manifest index 18406c2a756f..3366a7842e2a 100644 --- a/app-admin/git-credential-gopass/Manifest +++ b/app-admin/git-credential-gopass/Manifest @@ -1,2 +1,4 @@ DIST git-credential-gopass-1.15.11-deps.tar.xz 288548804 BLAKE2B 5c59db36a25762169ee3cbb9e5b7f9c91bd3d97b5ef6dea2e45f0345240bae05a6998359d3880fe5ed240b0c57888f7fe00229d6b0c930843ae1c3aa51004863 SHA512 ccc70e912e92c70de7ec49e824d559db2bd4ef0c907813ce0063b758b88c39c75dcc5d307d8527c13650edbcc0ebad20d981b8f2fcb32c32272e945bfe18a38b DIST git-credential-gopass-1.15.11.tar.gz 24602 BLAKE2B 3f479403071af80a08f9d28e9cce3fa492829fb7d6eb230f73ff1d84eaf3c4435fc82f3bfb2a7b29aa96c9a6c1c446d3160df5e0d3e3ff89b9e873e344b9afcf SHA512 50f5496a0ae6f60b9074d9c1a29d6dbcddeb6a0976859b6071ccf1fdb2b6796038d2f6dd5f8a3ce4644c5c31ad5f3447037bc87e9276287172174058ef75adfa +DIST git-credential-gopass-1.15.13-deps.tar.xz 29702324 BLAKE2B 5d4ee46252419ffa28994ba4fd2a3b4c3201be209d5f53b93ed6f15a32aa990c7be4e1a0f3d72c11883eb6d12cf11bf3b43ab735717a661d5ad5586d14334ed2 SHA512 d21d06eb4c8557b6466809865f35e89b2ed330d00b89cb91c16ef04cf65a96d36c4226081e4d85a5d0b0d2735b00b2bcfd922da423a3d0daafdd1b36a23d6938 +DIST git-credential-gopass-1.15.13.tar.gz 19323 BLAKE2B 6889fbb0f22b5a9ca882893bf0860bb41319e0f3ed01ea6c542caf8c94d4762116f5b84f907380dd723ffe1c57a7359a20cc1e05e7d3958d9f3a3debbd39c659 SHA512 f95d9ce853c5f9b46148d53504cad5992f701c776c3c4a2d53b10b7e94717651231ef5ab7cec7ab572c2badb75a0972c129ba09576598cf067bc4140f6c42196 diff --git a/app-admin/git-credential-gopass/git-credential-gopass-1.15.13.ebuild b/app-admin/git-credential-gopass/git-credential-gopass-1.15.13.ebuild new file mode 100644 index 000000000000..974e33be5d96 --- /dev/null +++ b/app-admin/git-credential-gopass/git-credential-gopass-1.15.13.ebuild @@ -0,0 +1,21 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Gopass git-credentials helper" +HOMEPAGE="https://github.com/gopasspw/git-credential-gopass" +SRC_URI="https://github.com/gopasspw/git-credential-gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" +SLOT="0" +KEYWORDS="amd64 ~ppc64 ~x86" + +DEPEND=">=dev-lang/go-1.16" +RDEPEND=" + dev-vcs/git + >=app-crypt/gnupg-2 +" diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest index faf378eb7a06..fc9a70491177 100644 --- a/app-admin/github-backup-utils/Manifest +++ b/app-admin/github-backup-utils/Manifest @@ -1,4 +1 @@ -DIST github-backup-utils-3.0.0.tar.gz 104088 BLAKE2B f01229e6b152231eb832dec8bef41bb158cc200bbdd3c59c1abab299c572902efe6d27d093491bd8b0bf8f3e834d2938eb0127d5f28700ba75dcbdbcc8a21bb8 SHA512 e86420ef9d86d44560e27e00361ff1bb8ba7c15fb116ad9981e3196bc4c7c25bcff9a9f7dc8dae9bbbb9b2f3380b434199dbbe1ef7db5b1ba04ec1233aec320d -DIST github-backup-utils-3.3.2.tar.gz 109517 BLAKE2B b9c48de60f10d1d20eda96d0fa69c7d1835c0cdca7dbb3a3659e2a527706d6d793c426d5032e2bd1ead58255cdca6cdf424da0cb6a06484c4a5b5a9b0d4bcbba SHA512 c8013d5775a0ad8193266c36b0afa91bd452dfd70499c74239c6e62a0c9d88ecd92e16495ad4bd64319e42ad7b781125c136b1a9945146d09add5a2165d31b16 -DIST github-backup-utils-3.5.0.tar.gz 113871 BLAKE2B e6835c3efe04332df792827e2fdc54449e73a1fec055e7677174a1eaf2b4c9d43a2bc4c82741b056265fbf4eeea75ad62819d9d357d800ff3d4befcf5fcd4e39 SHA512 d77e30fe426b231c8d8aa1ca7867861a3427a5829d46184283a1beaea22b697dd6cf7343d1e65f40c9f6f9bcd05fea0c45892080292707b6b897599d4cbb566b -DIST github-backup-utils-3.8.0.tar.gz 116694 BLAKE2B 481f0c4345d1de791d023c906d58424d96bf9e96fd3e5d50f081f6cbdd29b4e068f4414db6e808511adb8110e609416490ba36140b5dfabcf2e738b7b91e6121 SHA512 327d777f0134838ab6d1b3e3dc702b35e81f8a682339638b248dfdd9580fdea5435cad5a4a539c65d91832a8b02f86e3bdd546c312fcfe9c1ef13d858bbadb9f +DIST github-backup-utils-v3.12.3.tar.gz 154035 BLAKE2B 65c3071931f279c7045ca46348910ce6fca46e4bedfb4bfd1534a3a8f097a4eda023b62e0d3ffcd7289d62ae50771817ae1ef4766f5356b853374a4633f01b19 SHA512 be94707c524649cd9e84ac2882efa2e3f3576016281bac509f9dd0018563892d979177428c5c21c582857d1cc953ddd313f81313b40e961c7da1a4cdc0c952e8 diff --git a/app-admin/github-backup-utils/github-backup-utils-3.0.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-3.0.0.ebuild deleted file mode 100644 index 3febe92cd9f5..000000000000 --- a/app-admin/github-backup-utils/github-backup-utils-3.0.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Python3 support: https://github.com/github/backup-utils/pull/627 -PYTHON_COMPAT=( python3_{9..10} ) -inherit python-any-r1 - -DESCRIPTION="Backup and recovery utilities for GitHub Enterprise" -HOMEPAGE="https://github.com/github/backup-utils" -SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -# moreutils parallel is now used for speedups in main code: -# https://github.com/github/backup-utils/pull/635 -RDEPEND="net-misc/rsync - sys-apps/moreutils" - -# tests invoke parallel & rsync -DEPEND="test? ( - ${RDEPEND} - dev-util/checkbashisms - ${PYTHON_DEPS} -)" - -MY_PN="${PN/#github-/}" -S="${WORKDIR}/${MY_PN}-${PV}" - -src_compile() { - :; -} - -src_install() { - dobin bin/* - insinto usr/share/${PN} - doins share/${PN}/version - - exeinto usr/share/${PN} - doexe share/${PN}/bm.sh - doexe share/${PN}/ghe-* - - insinto etc/${PN} - newins backup.config-example backup.config - - dodoc -r docs/* -} - -src_test() { - emake test -} diff --git a/app-admin/github-backup-utils/github-backup-utils-3.8.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-3.12.3.ebuild index ff176f840c72..f1d91b23d18a 100644 --- a/app-admin/github-backup-utils/github-backup-utils-3.8.0.ebuild +++ b/app-admin/github-backup-utils/github-backup-utils-3.12.3.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) -inherit python-any-r1 +# PYTHON_COMPAT=( python3_{10..12} ) +# inherit python-any-r1 DESCRIPTION="Backup and recovery utilities for GitHub Enterprise" HOMEPAGE="https://github.com/github/backup-utils" -SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S=${WORKDIR}/${PN/#github-/}-${PV} +SRC_URI="https://github.com/github/backup-utils/releases/download/v${PV}/${PN}-v${PV}.tar.gz" +S=${WORKDIR}/${PN}-v${PV} LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" + +# tests restricted due to bug #796815 +RESTRICT="test" # moreutils parallel is now used for speedups in main code: # https://github.com/github/backup-utils/pull/635 @@ -25,15 +26,15 @@ RDEPEND="app-misc/jq sys-apps/moreutils" # tests invoke parallel & rsync -DEPEND="test? ( - ${RDEPEND} - dev-util/checkbashisms - ${PYTHON_DEPS} -)" - -pkg_setup() { - use test && python-any-r1_pkg_setup -} +# DEPEND="test? ( +# ${RDEPEND} +# dev-util/checkbashisms +# ${PYTHON_DEPS} +#)" + +# pkg_setup() { +# use test && python-any-r1_pkg_setup +#} src_compile() { :; diff --git a/app-admin/github-backup-utils/github-backup-utils-3.3.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-3.3.2.ebuild deleted file mode 100644 index 9a6d394ab4d4..000000000000 --- a/app-admin/github-backup-utils/github-backup-utils-3.3.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Python3 support: https://github.com/github/backup-utils/pull/627 -PYTHON_COMPAT=( python3_{9..10} ) -inherit python-any-r1 - -DESCRIPTION="Backup and recovery utilities for GitHub Enterprise" -HOMEPAGE="https://github.com/github/backup-utils" -SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -# moreutils parallel is now used for speedups in main code: -# https://github.com/github/backup-utils/pull/635 -RDEPEND="app-misc/jq - app-arch/pigz - net-misc/rsync - sys-apps/moreutils" - -# tests invoke parallel & rsync -DEPEND="test? ( - ${RDEPEND} - dev-util/checkbashisms - ${PYTHON_DEPS} -)" - -MY_PN="${PN/#github-/}" -S="${WORKDIR}/${MY_PN}-${PV}" - -src_compile() { - :; -} - -src_install() { - dobin bin/* - insinto usr/share/${PN} - doins share/${PN}/version - - exeinto usr/share/${PN} - doexe share/${PN}/bm.sh - doexe share/${PN}/ghe-* - - insinto etc/${PN} - newins backup.config-example backup.config - - dodoc -r docs/* -} - -src_test() { - emake test -} diff --git a/app-admin/github-backup-utils/github-backup-utils-3.5.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-3.5.0.ebuild deleted file mode 100644 index ac184ac47633..000000000000 --- a/app-admin/github-backup-utils/github-backup-utils-3.5.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Python3 support: https://github.com/github/backup-utils/pull/627 -PYTHON_COMPAT=( python3_{9..10} ) -inherit python-any-r1 - -DESCRIPTION="Backup and recovery utilities for GitHub Enterprise" -HOMEPAGE="https://github.com/github/backup-utils" -SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -# moreutils parallel is now used for speedups in main code: -# https://github.com/github/backup-utils/pull/635 -RDEPEND="app-misc/jq - app-arch/pigz - net-misc/rsync - sys-apps/moreutils" - -# tests invoke parallel & rsync -DEPEND="test? ( - ${RDEPEND} - dev-util/checkbashisms - ${PYTHON_DEPS} -)" - -MY_PN="${PN/#github-/}" -S="${WORKDIR}/${MY_PN}-${PV}" - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_compile() { - :; -} - -src_install() { - dobin bin/* - insinto usr/share/${PN} - doins share/${PN}/version - - exeinto usr/share/${PN} - doexe share/${PN}/bm.sh - doexe share/${PN}/ghe-* - - insinto etc/${PN} - newins backup.config-example backup.config - - dodoc -r docs/* -} - -src_test() { - emake test -} diff --git a/app-admin/github-backup-utils/metadata.xml b/app-admin/github-backup-utils/metadata.xml index 12873eec6d09..ba54e735cc9d 100644 --- a/app-admin/github-backup-utils/metadata.xml +++ b/app-admin/github-backup-utils/metadata.xml @@ -6,6 +6,7 @@ <name>William Hubbs</name> </maintainer> <upstream> - <remote-id type="github">github/backup-utils</remote-id> + <remote-id type="github">github/backup-utils</remote-id> + <bugs-to>https://support.github.com</bugs-to> </upstream> </pkgmetadata> diff --git a/app-admin/gopass-hibp/Manifest b/app-admin/gopass-hibp/Manifest index faab2b66f4e2..2c3e36606a58 100644 --- a/app-admin/gopass-hibp/Manifest +++ b/app-admin/gopass-hibp/Manifest @@ -1,2 +1,4 @@ DIST gopass-hibp-1.15.11-deps.tar.xz 288522100 BLAKE2B 623d425a5bbeea5c5746e18d0dd44d198fa4b54fd5112fc870a5e95f092324e4a477565260ee68bccf903601997561429ab5546c6b7aaa3cec6de816076fcbff SHA512 db7f26676aeb2c67ae0b8645e9feed57540adefc04bed4dba0072c6766cd020921def0a8dae8c26a29c10e26ad27d84983b76350d885118f8d6393e25fddaf3f DIST gopass-hibp-1.15.11.tar.gz 28709 BLAKE2B 0ec749f89896067f1a1b444f1dbf4508e67129cd012ea565edadcb87779c9f6ea1b62d4ea5fe1bef37f5fde7615e8254c003dd36ad9f1be488f8679b10211383 SHA512 781393893567c7f0a8089a0a61e9bf794661a00ae01d7505dd7a851093d6f3d2b75bf5c494aaf6c9696f400b95debd737f3f4719cd974dc94c3bfc1eb7db91ea +DIST gopass-hibp-1.15.13-deps.tar.xz 29737100 BLAKE2B 25cce3936716dda6fd1c760d055a6df6e412f50678295f139724eb84291f6a4447f6cfc05f57b636e67316fab29e94b164615d1ac86dd8738f46e8ddde9b5e71 SHA512 21afb52268e527d4b58bebdab62af8b812a0b2977532c0a99ea092d8e549221169c3f7260b75949d5abc689a9fb1ca6bdcb1e7235f1f2d6360a915c170059ba2 +DIST gopass-hibp-1.15.13.tar.gz 24047 BLAKE2B 79da4ca110585b6b928a27c7fdbf9094ce8110ac4d4bd99e645ae192caf816ab2f9f89d988bff60d84469853d3d08ffdda8eb51de9ccdf53474cedd3017b9687 SHA512 eb2eff7ffd16c166ee9ebfaa52273893b4f349fddba900ea966d0b39bf5f6f22b37cb76de8e0a327002138f1013d227bb066afcb9ff785b9afded97ebba17030 diff --git a/app-admin/gopass-hibp/gopass-hibp-1.15.13.ebuild b/app-admin/gopass-hibp/gopass-hibp-1.15.13.ebuild new file mode 100644 index 000000000000..e30950cff996 --- /dev/null +++ b/app-admin/gopass-hibp/gopass-hibp-1.15.13.ebuild @@ -0,0 +1,21 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Gopass haveibeenpwnd.com integration" +HOMEPAGE="https://github.com/gopasspw/gopass-hibp" +SRC_URI="https://github.com/gopasspw/gopass-hibp/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" +SLOT="0" +KEYWORDS="amd64 ~ppc64 ~x86" + +DEPEND=">=dev-lang/go-1.16" +RDEPEND=" + dev-vcs/git + >=app-crypt/gnupg-2 +" diff --git a/app-admin/gopass-jsonapi/Manifest b/app-admin/gopass-jsonapi/Manifest index 31ad3cb6aedd..502172becc97 100644 --- a/app-admin/gopass-jsonapi/Manifest +++ b/app-admin/gopass-jsonapi/Manifest @@ -1,2 +1,4 @@ DIST gopass-jsonapi-1.15.11-deps.tar.xz 288583480 BLAKE2B f914d07a5b00f82bb1baa3114736fdde720a8bfb4b2378c60015501c281a14b595fff96c40b06c0f9f8d867e5b2004a43aa9eed4e3cf4016bdfb2a8acb221a78 SHA512 220f31aae7db0a268b4658f1464c8b1256958f2d220ebc028701db1ab2eda998b92d493e0facf741fc4d83135cf53d3fda5ac24f84365cd567da3d825623b0f6 DIST gopass-jsonapi-1.15.11.tar.gz 36121 BLAKE2B cc9832c9473d1ed0095ff10f6fbbe763d0b4a3a76fb891089f75a0cd0eb677e1c1c87598ff8beb1494d5790870c39d78df0c52ce9be68a127e0d8d725a9dcdc0 SHA512 7231edc6bf6a529761a193fda40fdf254ffdaab6853d9a265d4d7ff3fcdc08fb418f9c4f1a05f32180eccde5add1a5276fa01133fc90a61c57c4c9793a9abc3a +DIST gopass-jsonapi-1.15.13-deps.tar.xz 149388536 BLAKE2B 2b5068a830edef67e330f918081bbdf218a2a0e80dc6c26e3d7b9d1d3779919dd869f57af32b0580f5be4787dc6df1325b5b1aba864c0bf0c2fd9d3e1c65364f SHA512 b6034103e0df9897cb95db3b8c9dc2895d7680385de14afcf7ab20db1d7eb537fa86ec56447267623b8493788802b1a1d6a9abff5c9d76f171847b79994cfa16 +DIST gopass-jsonapi-1.15.13.tar.gz 32433 BLAKE2B 6e16c2b060f2a380ede13840bea419b76b5e00cbc0dd29bbf72fc41900acfdeb6bb63908d09bfecbdc89c8c7266274a722fbb6d4b5848ee42fd986d36c3e30ca SHA512 e4b92558d17b27f4f4aada045ccfae4237e2021310ce1c64f3c29406c17f9f73ff61891ede96baebd741b4af15c0584ba8fe9fcb9693e288d17947e606d837b3 diff --git a/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.13.ebuild b/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.13.ebuild new file mode 100644 index 000000000000..828cd8d04aa5 --- /dev/null +++ b/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.13.ebuild @@ -0,0 +1,25 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Gopass Browser Bindings" +HOMEPAGE="https://github.com/gopasspw/gopass-jsonapi" +SRC_URI="https://github.com/gopasspw/gopass-jsonapi/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" +SLOT="0" +KEYWORDS="amd64 ~ppc64 ~x86" + +DEPEND=">=dev-lang/go-1.16" +RDEPEND=" + dev-vcs/git + >=app-crypt/gnupg-2 +" + +PATCHES=( + "${FILESDIR}/${PN}-1.15.3-skip-test.patch" +) diff --git a/app-admin/gopass-summon-provider/Manifest b/app-admin/gopass-summon-provider/Manifest index 299ff6263011..e41c0b45e045 100644 --- a/app-admin/gopass-summon-provider/Manifest +++ b/app-admin/gopass-summon-provider/Manifest @@ -1,2 +1,4 @@ DIST gopass-summon-provider-1.15.11-deps.tar.xz 288548804 BLAKE2B 5c59db36a25762169ee3cbb9e5b7f9c91bd3d97b5ef6dea2e45f0345240bae05a6998359d3880fe5ed240b0c57888f7fe00229d6b0c930843ae1c3aa51004863 SHA512 ccc70e912e92c70de7ec49e824d559db2bd4ef0c907813ce0063b758b88c39c75dcc5d307d8527c13650edbcc0ebad20d981b8f2fcb32c32272e945bfe18a38b DIST gopass-summon-provider-1.15.11.tar.gz 21218 BLAKE2B e042b2a003fa63fd79eaa24f3c50f1864238b7ae5c8d879c88c74c3795b6a9f97208c0b8ab51f3cde07a6a66155841a13517f49d900fd8fd49518775691e3926 SHA512 ae80aabe2216f37e1ac59509b3f7b2d785c0c0e20e7cc9fd42c170f7924be900e2b827daf117e174c69257595650ab287489017981c2988e6a5c1e4007ab1720 +DIST gopass-summon-provider-1.15.13-deps.tar.xz 29702324 BLAKE2B 5d4ee46252419ffa28994ba4fd2a3b4c3201be209d5f53b93ed6f15a32aa990c7be4e1a0f3d72c11883eb6d12cf11bf3b43ab735717a661d5ad5586d14334ed2 SHA512 d21d06eb4c8557b6466809865f35e89b2ed330d00b89cb91c16ef04cf65a96d36c4226081e4d85a5d0b0d2735b00b2bcfd922da423a3d0daafdd1b36a23d6938 +DIST gopass-summon-provider-1.15.13.tar.gz 16086 BLAKE2B b3b7656daf1189454c77772915120ab77615cf953ca1434919c901c5c0b708f0b1e124cfa63e9d8fa847d1aa12e403b630ccd023e16d6d3ef4d4cb507c7b36b9 SHA512 74809663c6b754894dc2f86c2153325b49bac862dbd29794b1997a11de34fd2bec4ddc583fefc19d4b920df64deedd7d9c508798d90426051d73648c3b545b7e diff --git a/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.13.ebuild b/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.13.ebuild new file mode 100644 index 000000000000..3dd1d2e881c7 --- /dev/null +++ b/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.13.ebuild @@ -0,0 +1,21 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Gopass Summon Provider" +HOMEPAGE="https://github.com/gopasspw/gopass-summon-provider" +SRC_URI="https://github.com/gopasspw/gopass-summon-provider/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" +SLOT="0" +KEYWORDS="amd64 ~ppc64 ~x86" + +DEPEND=">=dev-lang/go-1.16" +RDEPEND=" + dev-vcs/git + >=app-crypt/gnupg-2 +" diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest index 4364fb4ba686..e65f6f8ffda2 100644 --- a/app-admin/gopass/Manifest +++ b/app-admin/gopass/Manifest @@ -1,2 +1,4 @@ DIST gopass-1.15.11-deps.tar.xz 288006888 BLAKE2B 527cef72eb493425111c6fd0a872bb31c63381226c823143e5d722cb59172a08901a50fce7042d329370bc83dd66205833e85608d68ce9b2037db89eb1a1b8a7 SHA512 978c5a915d382b8fe6360744c45c696f8c3c571df1341496537be73896d100eda78be1630b2f4a3ccd73d828d566a483bc057a302683aa4ddf92f46b8fa49e03 DIST gopass-1.15.11.tar.gz 2319860 BLAKE2B 923be5effa8ca5a77a12bcd2692d2a07b68c6d068a579022e359a5f6e485813c37dc7e34acfeb1f0deec4e1075a54dd75b408ef0e07713cf7ffc2cfde2e9ac38 SHA512 ec3231f6cf903ba3a70f4721f04613ddf0e28e820c98a708c861ae68c993162a1346f62332132c00abd218f82f0ed0da0f8b86297427e813b0688a8eee5128be +DIST gopass-1.15.13-deps.tar.xz 284979668 BLAKE2B 12e42b897dfc613de810cc4c42e2318b5cad013e14b007daba454b800092f6e408e5ca10731b14d895673cd9426b322d94615a45954e3a0871b0b46533b6f6c9 SHA512 5e4a2f564d0140d77cdaf52a3784d75984db8b68152bf7137d3fbd727238e9509d56d280ceb1106fa47198bb8bc52980637652c10bd95524063bf1e3e962fdfb +DIST gopass-1.15.13.tar.gz 2328529 BLAKE2B 276ea675c7978ac1627cb313b595d9f252cc3aae29245eca758aed3b6632ddcdfa0da93cdc06f4c0767a2d5f58ded41fcccfac774b5001351bb4b743e976c595 SHA512 b7fcc7814ccad0cf0e3116eac848df080338e313ddcbb0cc8413cb353a1596b250aed427c97e791326e04c6c4241dbb529e112398218f2a905fc0fb48bc49963 diff --git a/app-admin/gopass/gopass-1.15.13.ebuild b/app-admin/gopass/gopass-1.15.13.ebuild new file mode 100644 index 000000000000..ebbaad82b80f --- /dev/null +++ b/app-admin/gopass/gopass-1.15.13.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module optfeature + +DESCRIPTION="a simple but powerful password manager for the terminal" +HOMEPAGE="https://www.gopass.pw/" +SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" + +DEPEND=">=dev-lang/go-1.18" +RDEPEND=" + dev-vcs/git + >=app-crypt/gnupg-2 +" + +PATCHES=( + "${FILESDIR}/${PN}-1.15.3-skip-tests.patch" +) + +src_test() { + # https://github.com/gopasspw/gopass/blob/v1.15.3/.github/workflows/build.yml#L38 + git config --global user.name nobody || die + git config --global user.email foo.bar@example.org || die + + default +} + +src_install() { + emake install DESTDIR="${ED}/usr" + einstalldocs +} + +pkg_postinst() { + optfeature "browser integration" app-admin/gopass-jsonapi + optfeature "git credentials helper" app-admin/git-credential-gopass + optfeature "haveibeenpwnd.com integration" app-admin/gopass-hibp + optfeature "summon secrets helper" app-admin/gopass-summon-provider +} diff --git a/app-admin/gtkdiskfree/files/gtkdiskfree-2.0.4-use-const-data-for-icon.patch b/app-admin/gtkdiskfree/files/gtkdiskfree-2.0.4-use-const-data-for-icon.patch new file mode 100644 index 000000000000..a1b99c946c73 --- /dev/null +++ b/app-admin/gtkdiskfree/files/gtkdiskfree-2.0.4-use-const-data-for-icon.patch @@ -0,0 +1,18 @@ +https://gitlab.com/listout/gtkdiskfree/-/commit/3e8d72c2e4115e1372edb81ae9e3a9cd682e9c48.patch +Bug: https://bugs.gentoo.org/923113 +From: Samuel Bauer <samuel.bauer@yahoo.fr> +Date: Tue, 8 Jun 2021 20:40:21 +0200 +Subject: [PATCH] Use const datas for icon + +--- a/src/icons/icon.xpm ++++ b/src/icons/icon.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * icon_xpm[] = { ++const static char * icon_xpm[] = { + "48 48 592 2", + " c None", + ". c #C7C7C7", +-- +GitLab + diff --git a/app-admin/gtkdiskfree/gtkdiskfree-2.0.4_p20200224-r2.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.4_p20200224-r2.ebuild new file mode 100644 index 000000000000..7b48a540eb7d --- /dev/null +++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.4_p20200224-r2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Graphical tool to show free disk space like df" +HOMEPAGE="https://gitlab.com/mazes_80/gtkdiskfree" +COMMIT="bdda379b9109a226a37801505a19da91494144a6" +SRC_URI="https://gitlab.com/mazes_80/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="gtk2" + +RDEPEND=" + dev-libs/glib + x11-libs/cairo + x11-libs/gdk-pixbuf + gtk2? ( x11-libs/gtk+:2 ) + !gtk2? ( x11-libs/gtk+:3 )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="sys-devel/gettext + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.4-musl-setlocale.patch + "${FILESDIR}"/${PN}-2.0.4-use-const-data-for-icon.patch +) + +src_configure() { + if use gtk2 ; then + econf $(use_with gtk2) + else + econf --enable-old-color-selector + fi +} diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest index 496cbb825952..3d20a8fdc378 100644 --- a/app-admin/hcloud/Manifest +++ b/app-admin/hcloud/Manifest @@ -1,3 +1,2 @@ -DIST hcloud-1.37.0.tar.xz 1868892 BLAKE2B 40268017c28877a5d26cb752e28511de591ca8dac9ab834b8ad5d15005306910a80501659ed1f827ca7184f1399a054519360c3a27d4081d08346bca53978537 SHA512 c785851a2085511bfb9b257a7267f51b4c8bcc9d14f6b595d772712aeb99c1d9db99a481b211bf110ee5c0fd260cc5a98d3dc5445a68807d5abeb050d0e89b81 -DIST hcloud-1.41.1.tar.xz 1869464 BLAKE2B 4ce755ae14bdfe5e90b673a31f3002ae812449593c3ba4fb08ec3ad0fe21cb2d57bf1dbe0f744d39b4844b165e49a86663a20bad1389d1468e052dbb6163deed SHA512 0e2236d0c4efabccca090866a87d7938d2eb39885b7901e3874c40e1ce672515376edc69471b411e862b1269ac538db380347738362bed1464064c4f6799f933 -DIST hcloud-1.42.0.tar.xz 1876444 BLAKE2B e7ed2e01a7c6bb106a5c46e21e26d8b6bdd7636b64c7b354674364c3db8c1776f09f199ea022e2f311e873490b737490ea22045aa00147c6066ff0a7fb96d563 SHA512 dab916666ec17b9675ba0a559170859779289c36739ac4c3d72445c87fb440df475e55e52ed628fd8d1a52421c6df4d47b0b51713e476753a66da74b3a7bf11c +DIST hcloud-1.43.1.tar.xz 1889004 BLAKE2B 563cde962cf1fd180bbef60127b714419c09da198afeb4923f8fc1cd48850131b3b91de243de43e269497f36d14757a1e71941d30dfbee98baebb533f20e6cdd SHA512 c8fa46e9d3e2c73cc2d86e597bebf6e1dbf28b7145dbc272c403607807251ac27eee14b9ad267fdf2aa730da16ce52be4d2b0d94653612b4f375f1779c95d90b +DIST hcloud-1.45.0.tar.xz 2192004 BLAKE2B f572f44e007b640f48cef06b165c77a7f90ad7ba4f96d6141e665c79a70267668c4c985ee5bba0c6faa73fc3b035f363aeab0d59a17707c48a4e1e9a8681387f SHA512 ff3584643d63cc4f64d902c29cc205629f1a4a71e1b27e714158948edfc63e0686436f8d77917156de6f829fceaad42def6f376b067723e3b25eb1b3137cd6e1 diff --git a/app-admin/hcloud/hcloud-1.37.0.ebuild b/app-admin/hcloud/hcloud-1.37.0.ebuild deleted file mode 100644 index 4a93fa28a173..000000000000 --- a/app-admin/hcloud/hcloud-1.37.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A command-line interface for Hetzner Cloud" -HOMEPAGE="https://github.com/hetznercloud/cli" -SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" - -IUSE="" -DEPEND=">=dev-lang/go-1.18:=" -RESTRICT="strip" -QA_FLAGS_IGNORED=".*" - -src_compile() { - go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed" -} - -src_test() { - # For upstream a simple test is run 'hcloud version' - ./hcloud version - if [[ $? -ne 0 ]] - then - die "Test failed" - fi -} - -src_install() { - dobin ${PN} -} diff --git a/app-admin/hcloud/hcloud-1.41.1.ebuild b/app-admin/hcloud/hcloud-1.43.1.ebuild index 8b7fa66f4318..1b73743024ed 100644 --- a/app-admin/hcloud/hcloud-1.41.1.ebuild +++ b/app-admin/hcloud/hcloud-1.43.1.ebuild @@ -1,7 +1,9 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit go-module DESCRIPTION="A command-line interface for Hetzner Cloud" HOMEPAGE="https://github.com/hetznercloud/cli" @@ -9,15 +11,10 @@ SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" - -IUSE="" -DEPEND=">=dev-lang/go-1.18:=" -RESTRICT="strip" -QA_FLAGS_IGNORED=".*" +KEYWORDS="amd64" src_compile() { - go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed" + ego build -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.versionPrerelease=gentoo" ./cmd/${PN} } src_test() { diff --git a/app-admin/hcloud/hcloud-1.42.0.ebuild b/app-admin/hcloud/hcloud-1.45.0.ebuild index 1525fc811206..c4449b25b091 100644 --- a/app-admin/hcloud/hcloud-1.42.0.ebuild +++ b/app-admin/hcloud/hcloud-1.45.0.ebuild @@ -13,10 +13,8 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="" - src_compile() { - ego build -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.Version=${PV}-gentoo" ./cmd/${PN} + ego build -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.versionPrerelease=gentoo" ./cmd/${PN} } src_test() { diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest index 8be10b71633c..28b068d7b138 100644 --- a/app-admin/helm/Manifest +++ b/app-admin/helm/Manifest @@ -1,6 +1,4 @@ -DIST helm-3.11.2-deps.tar.xz 125570640 BLAKE2B 7dd267c0070add0bd9ce70bc115cf9d2b427e32c5040f900ff750218aafcee331712ddc8da8c9655f06522696c5f4923a73ba8b94a13f16d09b8973d447817ad SHA512 4223461fa3d0032826387a4170492df561f828546fd4f4307ec5f2006e2abb77275382ebab57baea81767de97bcaa3642d88a022b07448e452e151d83fc04652 -DIST helm-3.12.3-deps.tar.xz 156473664 BLAKE2B 88e2e99465f977b1bec52350a3c4988a595152bacf8db0208e81b38c050ccbadb48f97e3c239ddae5fa8d16d04be5bff6d76fa09ce8fdfc73487c2a44980a2ab SHA512 211775262e51d2ebabd4bf991ba7ecc8fc0fa6b9fa06e35cb6edf127bbc21143fd04a6441759dba423950def31951067407e253b3554b9efd56b4ed93444f7ea DIST helm-3.13.2-deps.tar.xz 148836588 BLAKE2B 517f09305f68ef0c5ee34aecf2c5cd846a455a2fde725b4ef7befbb04bb731f8ba4c675b95d8d00be591ab02a60c707345ac4517bf235025fc3a5383ecd390cc SHA512 6785d15244fd94f884177db702436255dcee91e8d866ba5258d25d5a3d21d91c3de7b1644bf43a139d353005708c0ff615da1b09b3a18b3547efc05441d27ae2 -DIST k8s-helm-3.11.2.tar.gz 733884 BLAKE2B 2077927a61b8dcbf5907f8b2760445c8f846c186d504fc9bc9037fdafa4ad15cd8ccaaed3033be7d96cc3e05c74c283bf84c69d666721fef43198c44529db681 SHA512 32b251abf520692490e5dc9affa33b73955540a90854c84cc645364be8a4ca7afa1a9bf356a19be1efba6d35d36ef69f7b420402f73b96790f04635e9e881756 -DIST k8s-helm-3.12.3.tar.gz 721672 BLAKE2B d426d77e8fc8bb4ccd149e05bb3ee6f2ac38260a609bd2a5301a6318b961fb2ac19cd30f0c1372eaad67c5b8d301e356f310653ed8a682eba77d980cb0bf35e7 SHA512 25015a8ce8f04887ebb3add1a151670ff500c24b5b8933cfe3a956db1478483902a9c9c5bf57887b9f4b891e8d479752d9422ee68b43b9140fa0edc37cf38753 +DIST helm-3.15.2-deps.tar.xz 69934404 BLAKE2B 2a27c63c52f88e8b02e3db44d3ab8e0d5a0c4d46aa6ac0b97255cae475f4bea1c7f9223e9a53b1196c78d1ed093fe110c39e1cd96e31e7a3b5bf69470dec29c9 SHA512 5d6890ff3208cd0075128a44419f3652f17bbf6c84975c6dd54cba0d444dee05bf71254832f4cac0a9292e1918ad5c3372f4df14cf4dc5cadb532f5da2bf672a DIST k8s-helm-3.13.2.tar.gz 718707 BLAKE2B 10fa4c7212eeb9bfd3bbe1f3881c67ae0de83ec8931c20cb2fb5e35b5a10207fc9960d21e81c0796e6e37353fd4a2e5afe325bbaadd6d28afaff6d7b68b7f1ae SHA512 989bdc7f3a0ab5c460a8882c2bbd07c0736dee506e3247c0cc0bd9830a321d187f26ef51954c7b81307bd1064754f805be3e5980c5be7eefe4a954f254722902 +DIST k8s-helm-3.15.2.tar.gz 732780 BLAKE2B b62a9064393378ec459fc9b1b81795c21af98d272388b831a07cb38254aafbd378149733916a6985ff816c4c2da67036fe81adca41be32cb96b16d348e797a3e SHA512 bf37ac419d3a8b98e8c7ca81e6e6e9fd1dab0a3b1c4824e3e98040859790ebb2bf4d1a972333a5d28e56d3f3d64590a34acc6af44bb56b7ac1fbfdcba3a5c0c5 diff --git a/app-admin/helm/helm-3.11.2.ebuild b/app-admin/helm/helm-3.11.2.ebuild deleted file mode 100644 index 4f4a89ee621a..000000000000 --- a/app-admin/helm/helm-3.11.2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit bash-completion-r1 go-module -GIT_COMMIT=912ebc1cd10d38d340f048efaf0abda047c3468e -GIT_SHA=912ebc1c -MY_PV=${PV/_rc/-rc.} - -DESCRIPTION="Kubernetes Package Manager" -HOMEPAGE="https://github.com/helm/helm https://helm.sh" -SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> k8s-${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" - -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~loong ~riscv" - -RESTRICT=" test" - -src_compile() { - emake \ - GOFLAGS="${GOFLAGS}" \ - LDFLAGS="" \ - GIT_COMMIT=${GIT_COMMIT} \ - GIT_SHA=${GIT_SHA} \ - GIT_TAG=v${MY_PV} \ - GIT_DIRTY=clean \ - build - bin/${PN} completion bash > ${PN}.bash || die - bin/${PN} completion zsh > ${PN}.zsh || die -} - -src_install() { - newbashcomp ${PN}.bash ${PN} - insinto /usr/share/zsh/site-functions - newins ${PN}.zsh _${PN} - - dobin bin/${PN} - dodoc README.md -} diff --git a/app-admin/helm/helm-3.13.2.ebuild b/app-admin/helm/helm-3.13.2.ebuild index c82d02143876..2e6be981ee17 100644 --- a/app-admin/helm/helm-3.13.2.ebuild +++ b/app-admin/helm/helm-3.13.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~loong ~riscv" +KEYWORDS="amd64 ~arm64 ~loong ~riscv" RESTRICT=" test" diff --git a/app-admin/helm/helm-3.12.3.ebuild b/app-admin/helm/helm-3.15.2.ebuild index c73593f6e142..8432f2b538c6 100644 --- a/app-admin/helm/helm-3.12.3.ebuild +++ b/app-admin/helm/helm-3.15.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit bash-completion-r1 go-module -GIT_COMMIT=3a31588ad33fe3b89af5a2a54ee1d25bfe6eaa5e -GIT_SHA=3a31588a +inherit shell-completion go-module +GIT_COMMIT=1a500d5625419a524fdae4b33de351cc4f58ec35 +GIT_SHA=1a500d56 MY_PV=${PV/_rc/-rc.} DESCRIPTION="Kubernetes Package Manager" @@ -33,8 +33,7 @@ src_compile() { src_install() { newbashcomp ${PN}.bash ${PN} - insinto /usr/share/zsh/site-functions - newins ${PN}.zsh _${PN} + newzshcomp ${PN}.zsh _${PN} dobin bin/${PN} dodoc README.md diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest index 1c35ecef078a..ed8e18a27c30 100644 --- a/app-admin/keepass/Manifest +++ b/app-admin/keepass/Manifest @@ -1,3 +1,4 @@ DIST KeePass-2.49-Source.zip 5135190 BLAKE2B bf5a9aab0065a97545bd1b81a74b5ab113e4c4802873445719ce2a571745b04c69ab5d8be9a67dc59a713947f0955cbcccc782b6628f722a0d564283b943eee6 SHA512 7a25de6acb2637bd8820fb70866ab4ced4ece4b3e64172f616c2fb59d2a4e7a2f340435db10731ed3d7e66db7761487925cf1c7941b0bac12e72c5fcd9e8b7d3 DIST KeePass-2.53-Source.zip 5201820 BLAKE2B a87918278915f1a54d8f6d6b8ef05d5a86f41a58887a1c80a8217112061fd40d59393012ae7b69d6c2110a7b0b36c57ecce4292a68e9161e99e1762b1622192e SHA512 8d35ec83ada7142e91be6a5889eabb98f1d8fe32140a3b904db76d64f42bed0ce1cc0378f38560b7f1307df545f00a398da599ef9fc44474e8c16722433d4e4e DIST KeePass-2.56-Source.zip 5231868 BLAKE2B d7ed0baf6db6a0398ce9bceb9a61088ef7cc14ba0c5b13a01123f9c7fca37e52bf352c438c3100ba32d59cfcfa90de790a07649684a971224bba6eb554cbed34 SHA512 cee9d8569e59a29044760dc94c4ab3ee6f1eb26aaa12d18a36d9e1b87e421291b49a3747fdb340a7af06494d65fe4d37579f16a577b0af2c053504b80e8a1c60 +DIST KeePass-2.57-Source.zip 5238885 BLAKE2B d7015eda056109aa0dc575a21a8ad720db4503a0cbf3124e6e0d0e0cf3d856a5a6509e605b3c1aafe984befa85646d716cdbe74fda936a967fd3da2778e7c455 SHA512 c553d2fa67d6c32b8122959bf222d6edadd79a9784802ac8f391ba0e89163172f431a24140d9dce775130d02374880e432c6958dfa19808f20f617e2f8067a30 diff --git a/app-admin/keepass/keepass-2.49.ebuild b/app-admin/keepass/keepass-2.49.ebuild index 2e453b7a9ddf..218b7363d31b 100644 --- a/app-admin/keepass/keepass-2.49.ebuild +++ b/app-admin/keepass/keepass-2.49.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit desktop optfeature wrapper xdg-utils MY_PN="KeePass" DESCRIPTION="A free, open source, light-weight and easy-to-use password manager" HOMEPAGE="https://keepass.info/" -SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}-${PV}-Source.zip" S="${WORKDIR}" LICENSE="GPL-2" diff --git a/app-admin/keepass/keepass-2.53.ebuild b/app-admin/keepass/keepass-2.53.ebuild index 465f3b38acb4..d5f8f014254f 100644 --- a/app-admin/keepass/keepass-2.53.ebuild +++ b/app-admin/keepass/keepass-2.53.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit desktop optfeature wrapper xdg-utils MY_PN="KeePass" DESCRIPTION="A free, open source, light-weight and easy-to-use password manager" HOMEPAGE="https://keepass.info/" -SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}-${PV}-Source.zip" S="${WORKDIR}" LICENSE="GPL-2" diff --git a/app-admin/keepass/keepass-2.56.ebuild b/app-admin/keepass/keepass-2.56.ebuild index 439e07752469..6cde0c268a1d 100644 --- a/app-admin/keepass/keepass-2.56.ebuild +++ b/app-admin/keepass/keepass-2.56.ebuild @@ -8,7 +8,7 @@ inherit desktop optfeature wrapper xdg-utils MY_PN="KeePass" DESCRIPTION="A free, open source, light-weight and easy-to-use password manager" HOMEPAGE="https://keepass.info/" -SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}-${PV}-Source.zip" S="${WORKDIR}" LICENSE="GPL-2" diff --git a/app-admin/keepass/keepass-2.57.ebuild b/app-admin/keepass/keepass-2.57.ebuild new file mode 100644 index 000000000000..6cde0c268a1d --- /dev/null +++ b/app-admin/keepass/keepass-2.57.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop optfeature wrapper xdg-utils + +MY_PN="KeePass" +DESCRIPTION="A free, open source, light-weight and easy-to-use password manager" +HOMEPAGE="https://keepass.info/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}-${PV}-Source.zip" +S="${WORKDIR}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="aot" + +BDEPEND="app-arch/unzip" +DEPEND="dev-lang/mono" +RDEPEND=" + ${DEPEND} + dev-dotnet/libgdiplus[cairo] +" + +PATCHES=( "${FILESDIR}/${PN}-2.53-xsl-path-detection.patch" ) + +# bug #687052 +# file generated by mono --aot where *FLAGS don't make sense +QA_PREBUILT="usr/lib64/keepass/KeePass.exe.so" + +src_prepare() { + # KeePass looks for some XSL files in the same folder as the executable, + # we prefer to have it in /usr/share/KeePass. Apply patch using base function. + # This XSL file will not be upstreamed since the KeePass creator said that + # including this patch would break the Portable USB version of KeePass + # (which keeps/looks for xsl files in its own folder) + default + + # Switch into build dir so the mono prepration script works correctly + pushd Build || die + source PrepMonoDev.sh || die + popd || die +} + +src_compile() { + export MONO_REGISTRY_PATH=/dev/null # bug 659808 + + # bug 704358 + export LANG=C LC_ALL=C + + # Build with Release target + xbuild /target:KeePass /property:Configuration=Release || die + + # Run Ahead Of Time compiler on the binary + if use aot; then + cp Ext/KeePass.exe.config Build/KeePass/Release/ || die + mono --aot -O=all Build/KeePass/Release/KeePass.exe || die + fi +} + +src_install() { + # Wrapper script to launch mono + make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe" + + # Some XSL files + insinto "/usr/share/${PN}/XSL" + doins Ext/XSL/* + + insinto "/usr/$(get_libdir)/${PN}" + exeinto "/usr/$(get_libdir)/${PN}" + + doins Ext/KeePass.exe.config + + # Default configuration, simply says to use user-specific configuration + doins Ext/KeePass.config.xml + + # The actual executable + doexe Build/KeePass/Release/KeePass.exe + + # Copy the AOT compilation result + if use aot; then + doexe Build/KeePass/Release/KeePass.exe.so + fi + + # Prepare the icons + newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png" + newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png" + + # Create a desktop entry and associate it with the KeePass mime type + make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;" + + # MIME descriptor for .kdbx files + insinto /usr/share/mime/packages + doins "${FILESDIR}/${PN}.xml" + + # sed, because patching this really sucks + sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + + optfeature "enables autotype/autofill" x11-misc/xdotool + + elog "Some systems may experience issues with copy and paste operations." + elog "If you encounter this, please install x11-misc/xsel." +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index e1a279ed1ea6..ea5f82e43830 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1 +1,2 @@ -DIST keepassxc-2.7.6-src.tar.xz 8474624 BLAKE2B 2ecdd387a7bc70aeeaef6eeabdfeed6aaf1d779056580375c011aa71d62459d38258617a4cb46fc3b215a2b6e1e3326cc8c62b228bee0be674923399421b0cbe SHA512 58bdf731e1ce15e4a9db5aae27b7740372c4b28e2998b9acf2d1be6ee5b4eead37149ddd3de039d1cb70d34f11b09f43969d36ce4241b3fe3af4adf53d8ba812 +DIST keepassxc-2.7.8-src.tar.xz 9764860 BLAKE2B edc5af2b7bd6173f8df4fa20fca54e78c40610d29b02ac9f9920382b8ead3ea293e22e578c353ffc1a374a23f1117a2595570d1de7053a1d36bcb40ed8eceb04 SHA512 c4767ced36d45855b83569d0fcbcfd384ef51d204dd703b006508d55cd7ac94ac36b5476f122fbe1dc6ec301a785e026722e8f0f961d5e339e10997a3871741a +DIST keepassxc-2.7.9-src.tar.xz 9789312 BLAKE2B d9be3e577ae918160662558bb8bd724b5ca5982cb1bba5cda47f0dff042ea9a5c7393dd76ad195a7ba6c9b9e8371c4416840e4ff89e07c610d7351859586acfa SHA512 255102d3b3723a80cdd5f14cde2130b37807db226b48e985bcc2ab537b482e3fb23afde331e15ed02727e98b526d894aa4567f2e82039a2ad9d33a6ad9ea08a4 diff --git a/app-admin/keepassxc/files/keepassxc-2.7.9-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.9-tests.patch new file mode 100644 index 000000000000..153b3c721018 --- /dev/null +++ b/app-admin/keepassxc/files/keepassxc-2.7.9-tests.patch @@ -0,0 +1,12 @@ +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -246,9 +246,6 @@ if(WITH_XC_NETWORKING OR WITH_XC_BROWSER) + add_unit_test(NAME testurltools SOURCES TestUrlTools.cpp LIBS ${TEST_LIBRARIES}) + endif() + +-add_unit_test(NAME testcli SOURCES TestCli.cpp +- LIBS testsupport cli ${ZXCVBN_LIBRARIES} ${TEST_LIBRARIES}) +-target_compile_definitions(testcli PRIVATE KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>") + + if(WITH_GUI_TESTS) + add_subdirectory(gui) diff --git a/app-admin/keepassxc/keepassxc-2.7.6.ebuild b/app-admin/keepassxc/keepassxc-2.7.8.ebuild index 0ca6281dbb85..5cdd333ad983 100644 --- a/app-admin/keepassxc/keepassxc-2.7.6.ebuild +++ b/app-admin/keepassxc/keepassxc-2.7.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,18 +9,21 @@ DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" HOMEPAGE="https://keepassxc.org/ https://github.com/keepassxreboot/keepassxc/" -if [[ "${PV}" != *9999 ]] ; then +if [[ "${PV}" = *9999* ]] ; then + inherit git-r3 + + EGIT_BRANCH="develop" + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" +else if [[ "${PV}" == *_beta* ]] ; then - SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz + -> ${P}.tar.gz" S="${WORKDIR}/${P/_/-}" else SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" fi -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" - [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master" + + KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" fi LICENSE="LGPL-2.1 GPL-2 GPL-3" @@ -42,27 +45,33 @@ RDEPEND=" dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= - sys-libs/zlib:= - X? ( dev-qt/qtx11extras:5 ) + sys-libs/zlib:=[minizip] + X? ( + dev-qt/qtx11extras:5 + ) autotype? ( x11-libs/libX11 x11-libs/libXtst ) - keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( dev-libs/libusb:1 sys-apps/pcsc-lite ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} dev-qt/qttest:5 " BDEPEND=" dev-qt/linguist-tools:5 - doc? ( dev-ruby/asciidoctor ) + doc? ( + dev-ruby/asciidoctor + ) " -PATCHES=( "${FILESDIR}"/${PN}-2.7.4-tests.patch ) +PATCHES=( + "${FILESDIR}/${PN}-2.7.4-tests.patch" +) src_prepare() { if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then @@ -76,7 +85,7 @@ src_configure() { # https://github.com/keepassxreboot/keepassxc/issues/5801 filter-lto - local mycmakeargs=( + local -a mycmakeargs=( # Gentoo users enable ccache via e.g. FEATURES=ccache or # other means. We don't want the build system to enable it for us. -DWITH_CCACHE=OFF @@ -85,6 +94,7 @@ src_configure() { -DWITH_XC_AUTOTYPE="$(usex autotype)" -DWITH_XC_DOCS="$(usex doc)" -DWITH_XC_BROWSER="$(usex browser)" + -DWITH_XC_BROWSER_PASSKEYS="$(usex browser)" -DWITH_XC_BOTAN3=ON -DWITH_XC_FDOSECRETS=ON -DWITH_XC_KEESHARE="$(usex keeshare)" @@ -95,7 +105,9 @@ src_configure() { -DWITH_XC_X11="$(usex X)" ) if [[ "${PV}" == *_beta* ]] ; then - mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) + mycmakeargs+=( + -DOVERRIDE_VERSION="${PV/_/-}" + ) fi cmake_src_configure } diff --git a/app-admin/keepassxc/keepassxc-2.7.9.ebuild b/app-admin/keepassxc/keepassxc-2.7.9.ebuild new file mode 100644 index 000000000000..1e8de6d2d084 --- /dev/null +++ b/app-admin/keepassxc/keepassxc-2.7.9.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic xdg + +DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" +HOMEPAGE="https://keepassxc.org/ + https://github.com/keepassxreboot/keepassxc/" + +if [[ "${PV}" = *9999* ]] ; then + inherit git-r3 + + EGIT_BRANCH="develop" + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" +else + if [[ "${PV}" == *_beta* ]] ; then + SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}/${P/_/-}" + else + SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz" + fi + + KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" +fi + +LICENSE="LGPL-2.1 GPL-2 GPL-3" +SLOT="0" +IUSE="X autotype browser doc keeshare +network test yubikey" + +RESTRICT="!test? ( test )" +REQUIRED_USE="autotype? ( X )" + +RDEPEND=" + app-crypt/argon2:= + dev-libs/botan:3= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + media-gfx/qrencode:= + sys-libs/readline:0= + sys-libs/zlib:=[minizip] + X? ( + dev-qt/qtx11extras:5 + ) + autotype? ( + x11-libs/libX11 + x11-libs/libXtst + ) + yubikey? ( + dev-libs/libusb:1 + sys-apps/pcsc-lite + ) +" +DEPEND=" + ${RDEPEND} + dev-qt/qttest:5 +" +BDEPEND=" + dev-qt/linguist-tools:5 + doc? ( + dev-ruby/asciidoctor + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.7.9-tests.patch" +) + +src_prepare() { + if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then + printf '%s' "${PV}" > .version || die + fi + + cmake_src_prepare +} + +src_configure() { + # https://github.com/keepassxreboot/keepassxc/issues/5801 + filter-lto + + local -a mycmakeargs=( + # Gentoo users enable ccache via e.g. FEATURES=ccache or + # other means. We don't want the build system to enable it for us. + -DWITH_CCACHE=OFF + -DWITH_GUI_TESTS=OFF + -DWITH_TESTS="$(usex test)" + -DWITH_XC_AUTOTYPE="$(usex autotype)" + -DWITH_XC_DOCS="$(usex doc)" + -DWITH_XC_BROWSER="$(usex browser)" + -DWITH_XC_BROWSER_PASSKEYS="$(usex browser)" + -DWITH_XC_BOTAN3=ON + -DWITH_XC_FDOSECRETS=ON + -DWITH_XC_KEESHARE="$(usex keeshare)" + -DWITH_XC_NETWORKING="$(usex network)" + -DWITH_XC_SSHAGENT=ON + -DWITH_XC_UPDATECHECK=OFF + -DWITH_XC_YUBIKEY="$(usex yubikey)" + -DWITH_XC_X11="$(usex X)" + ) + if [[ "${PV}" == *_beta* ]] ; then + mycmakeargs+=( + -DOVERRIDE_VERSION="${PV/_/-}" + ) + fi + cmake_src_configure +} diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 186c07c60416..11cc2ac9b84e 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,18 +9,21 @@ DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" HOMEPAGE="https://keepassxc.org/ https://github.com/keepassxreboot/keepassxc/" -if [[ "${PV}" != *9999 ]] ; then +if [[ "${PV}" = *9999* ]] ; then + inherit git-r3 + + EGIT_BRANCH="develop" + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" +else if [[ "${PV}" == *_beta* ]] ; then - SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz + -> ${P}.tar.gz" S="${WORKDIR}/${P/_/-}" else SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" - [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master" + + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi LICENSE="LGPL-2.1 GPL-2 GPL-3" @@ -42,26 +45,34 @@ RDEPEND=" dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= - sys-libs/zlib:= - X? ( dev-qt/qtx11extras:5 ) + sys-libs/zlib:=[minizip] + X? ( + dev-qt/qtx11extras:5 + ) autotype? ( x11-libs/libX11 x11-libs/libXtst ) - keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( dev-libs/libusb:1 sys-apps/pcsc-lite ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} dev-qt/qttest:5 " BDEPEND=" dev-qt/linguist-tools:5 - doc? ( dev-ruby/asciidoctor ) + doc? ( + dev-ruby/asciidoctor + ) " +PATCHES=( + "${FILESDIR}/${PN}-2.7.4-tests.patch" +) + src_prepare() { if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then printf '%s' "${PV}" > .version || die @@ -74,7 +85,7 @@ src_configure() { # https://github.com/keepassxreboot/keepassxc/issues/5801 filter-lto - local mycmakeargs=( + local -a mycmakeargs=( # Gentoo users enable ccache via e.g. FEATURES=ccache or # other means. We don't want the build system to enable it for us. -DWITH_CCACHE=OFF @@ -83,6 +94,7 @@ src_configure() { -DWITH_XC_AUTOTYPE="$(usex autotype)" -DWITH_XC_DOCS="$(usex doc)" -DWITH_XC_BROWSER="$(usex browser)" + -DWITH_XC_BROWSER_PASSKEYS="$(usex browser)" -DWITH_XC_BOTAN3=ON -DWITH_XC_FDOSECRETS=ON -DWITH_XC_KEESHARE="$(usex keeshare)" @@ -93,7 +105,9 @@ src_configure() { -DWITH_XC_X11="$(usex X)" ) if [[ "${PV}" == *_beta* ]] ; then - mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) + mycmakeargs+=( + -DOVERRIDE_VERSION="${PV/_/-}" + ) fi cmake_src_configure } diff --git a/app-admin/keepassxc/metadata.xml b/app-admin/keepassxc/metadata.xml index dc74e3197e66..d236dbe97541 100644 --- a/app-admin/keepassxc/metadata.xml +++ b/app-admin/keepassxc/metadata.xml @@ -5,10 +5,6 @@ <email>xgqt@gentoo.org</email> <name>Maciej Barć</name> </maintainer> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> <use> <flag name="autotype">Add support to autotype the passwords into other applications</flag> <flag name="browser">Enables browser plugin support</flag> diff --git a/app-admin/kpcli/Manifest b/app-admin/kpcli/Manifest index d5ab1376368a..54844994aa67 100644 --- a/app-admin/kpcli/Manifest +++ b/app-admin/kpcli/Manifest @@ -1 +1,2 @@ DIST kpcli-3.8.1.pl 263292 BLAKE2B 70e9e4ca56466e51314e891de2282f9124c7eedd0f7aea7abfc4ad94a1f4ebcc4d65dc09573560e4cc90be4a2f4a3156d6d4e57f3cb5a27de297fca137fc9cbb SHA512 5d4ba12112b6b82dc150193f6c2210c868c6582726cf157f05d2ad74224ac6f637d09075ae410ce91481b222cc1f40c3fb2f6267923a04a06211929d92a05097 +DIST kpcli-4.1.pl 366041 BLAKE2B 71a3814981a3ebfc9a9d784bab5706ff58796e84f8f58472da9f1f800b63a6ade4c8b8e334a1f118c4783d19f27c5d0af5b0bbaeb75d1cb6337967a3ac2a7f33 SHA512 54352fee32b381a73ab65bd8743115e867883a731d23722dde1102803579349fde130f8ffd23904996125f4d23cd4709dc0416ba668efa8a569cb64ee883ca8f diff --git a/app-admin/kpcli/kpcli-4.1.ebuild b/app-admin/kpcli/kpcli-4.1.ebuild new file mode 100644 index 000000000000..c9b8aa4f2afe --- /dev/null +++ b/app-admin/kpcli/kpcli-4.1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature + +DESCRIPTION="Command line interface to KeePass database files" +HOMEPAGE="https://kpcli.sourceforge.io/" +SRC_URI="https://downloads.sourceforge.net/project/kpcli/${P}.pl" + +LICENSE="|| ( Artistic GPL-1+ )" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-perl/Clone + dev-perl/Crypt-Rijndael + dev-perl/File-KeePass + dev-perl/Math-Random-ISAAC + dev-perl/Sort-Naturally + dev-perl/Sub-Install + dev-perl/TermReadKey + dev-perl/Term-ReadLine-Gnu + dev-perl/Term-ShellUI" + +src_unpack() { + mkdir "${S}" || die + cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die +} + +src_compile() { :; } + +src_install() { + dobin kpcli +} + +pkg_postinst() { + optfeature "time-based-one-time-only password support" "dev-perl/Authen-OATH dev-perl/Convert-Base32" + optfeature "X clipboard support" "dev-perl/Capture-Tiny dev-perl/Clipboard" + optfeature "password quality check" dev-perl/Data-Password + optfeature "better password quality check" dev-perl/Data-Password-passwdqc + optfeature "importing Password Safe v3 databases" dev-perl/Crypt-PWSafe3 +} diff --git a/app-admin/lib_users/lib_users-0.15-r1.ebuild b/app-admin/lib_users/lib_users-0.15-r1.ebuild new file mode 100644 index 000000000000..5faf526074f6 --- /dev/null +++ b/app-admin/lib_users/lib_users-0.15-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit python-r1 + +DESCRIPTION="Check for mapped libs and open files that are marked as deleted" +HOMEPAGE="https://github.com/klausman/lib_users" +SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86" +IUSE="test" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + test? ( + dev-python/nose2[${PYTHON_USEDEP}] + )" +RDEPEND="${PYTHON_DEPS}" + +src_test() { + python_foreach_impl nose2 --verbosity=2 +} + +my_install() { + python_newscript lib_users.py lib_users + python_newscript fd_users.py fd_users + # lib_users_util/ contains a test script we don't want, so do things by hand + python_moduleinto lib_users_util + python_domodule lib_users_util/common.py + python_domodule lib_users_util/__init__.py +} + +src_install() { + python_foreach_impl my_install + dodoc README.md TODO +} diff --git a/app-admin/linode-cli/Manifest b/app-admin/linode-cli/Manifest index f5c159c9d423..70eb9dda5fca 100644 --- a/app-admin/linode-cli/Manifest +++ b/app-admin/linode-cli/Manifest @@ -1,2 +1 @@ -DIST linode-cli-5.47.1.tar.gz 128364 BLAKE2B db21cdd9a1bfbe17fb17b8b0e27ca36bb15c7d3b16ddde4dcc59a9ce64cd34d644d3d5d120efb88bb146767cf9b2c3ee820a847a2fcff487a11bc3abd6973870 SHA512 b61ac1e7c97a1395b150227fe822bc2e7199ed15a44c6d93d71bfdbc2f919827e87e89cf41a47b069be06144a849f5ab11c9dd7f38d138f80ce80563f55bf75a -DIST linode-cli-5.48.2.tar.gz 141600 BLAKE2B fadabfb421945809ceba396324ac9930d1fd795bceab4e90023038881fb8ba5af1b19187f414e70b5a86ea7d560202c76669dfe76ba952bcbe958b7213aff241 SHA512 f2d0e3f62ff93fc9906d70b1121e73f98319dd8afc38ddb124d35295dffef085aa75c93d299538499ea71d087de19060fc3f52ab5f6b31ef47f46435f010b0fd +DIST linode_cli-5.50.0.tar.gz 146902 BLAKE2B ebe83454f06bc281a91dcc276db7378779d73717ca49bbcc81fe59e61c6eb448d7a7bde9e5482bb21ca05c0484001f86dab4b4296011ecbb156c13b38573f7ea SHA512 3fb95f76c19f17f897ebce3bfb6d32de1f9a2ed2d8ba9078180e465acbe20b873a59092809a2c766c326e0c5e27c983c84aef9ae7c210004f51b2b62225694e1 diff --git a/app-admin/linode-cli/linode-cli-5.47.1.ebuild b/app-admin/linode-cli/linode-cli-5.47.1.ebuild deleted file mode 100644 index 45ee6333667a..000000000000 --- a/app-admin/linode-cli/linode-cli-5.47.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -inherit distutils-r1 pypi - -DESCRIPTION="Linode Command Line Interface" -HOMEPAGE="https://github.com/linode/linode-cli https://www.linode.com/" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-python/boto3[${PYTHON_USEDEP}] - dev-python/openapi3[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/rich[${PYTHON_USEDEP}] - <dev-python/urllib3-3[${PYTHON_USEDEP}] -" diff --git a/app-admin/linode-cli/linode-cli-5.48.2.ebuild b/app-admin/linode-cli/linode-cli-5.50.0.ebuild index 2ce8851657d3..21d1ca44d811 100644 --- a/app-admin/linode-cli/linode-cli-5.48.2.ebuild +++ b/app-admin/linode-cli/linode-cli-5.50.0.ebuild @@ -5,10 +5,9 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -inherit distutils-r1 pypi +inherit distutils-r1 pypi shell-completion -DESCRIPTION="Linode Command Line Interface" +DESCRIPTION="Official command-line interface for interacting with the Linode API" HOMEPAGE="https://github.com/linode/linode-cli https://www.linode.com/" LICENSE="BSD" @@ -21,7 +20,7 @@ RESTRICT="test" RDEPEND=" dev-python/boto3[${PYTHON_USEDEP}] - dev-python/linode-metadata[${PYTHON_USEDEP}] + >=dev-python/linode-metadata-0.3[${PYTHON_USEDEP}] dev-python/openapi3[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] @@ -29,3 +28,18 @@ RDEPEND=" dev-python/rich[${PYTHON_USEDEP}] <dev-python/urllib3-3[${PYTHON_USEDEP}] " + +python_install_all() { + distutils-r1_python_install_all + + PYTHONPATH=. ${EPYTHON} linodecli completion bash > "${T}/${PN}".bash || die + PYTHONPATH=. ${EPYTHON} linodecli completion fish > "${T}/${PN}".fish || die + + newbashcomp "${T}/${PN}".bash ${PN} + newfishcomp "${T}/${PN}".fish ${PN} + + dosym ${PN} "$(get_bashcompdir)"/linode + dosym ${PN} "$(get_bashcompdir)"/lin + dosym ${PN} "$(get_fishcompdir)"/linode + dosym ${PN} "$(get_fishcompdir)"/lin +} diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest index 8561cd07dd0a..39e13c144333 100644 --- a/app-admin/lnav/Manifest +++ b/app-admin/lnav/Manifest @@ -1,2 +1 @@ -DIST lnav-0.11.1.tar.gz 10268167 BLAKE2B d490c6798685e80021437e1771742dee59c3b5109a43591581f4ddc15528c5b616ab915418fa78b7cf13a82bce582baf0516b5b2339f5fa32054359c21908852 SHA512 6c7d2b603ee04bb2cee16bf28b0161ebe7bf3ec838bed765f9852f79ee1ff8a56691dcaa66998e0ef58f16f16274bf93c7f2eb8f2e58264faf284bcfd25818ef DIST lnav-0.11.2.tar.gz 12379373 BLAKE2B 513e10f44d3770fb0135ad7fd035d07b35d2a44b2745acf700de0bf82ef428eb1549f9fd389ae4d6e3e268378a980f59f164479390a2a3faea16555941d3c9ca SHA512 a48c81e075923a5e1cdb051dd18329ff417f628518c8273fc19d0787226414668e1c29645edf20a46173fdf65a2b8978517948317fdc8b45c772fdc82cb82154 diff --git a/app-admin/lnav/files/lnav-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch b/app-admin/lnav/files/lnav-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch deleted file mode 100644 index 0dffeeb9bdbb..000000000000 --- a/app-admin/lnav/files/lnav-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/tstack/lnav/pull/1112 - -From e25d3e3c69fcf57bbaec2333846b9a43c4d1fc90 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sat, 21 Jan 2023 18:11:20 +0000 -Subject: [PATCH] Fix build with GCC 13 (add missing <cstdint> include) - -GCC 13 (as usual for new compiler releases) shuffles around some -internal includes and so <cstdint> is no longer transitively included. - -Explicitly include <cstdint> for uint32_t. - -Signed-off-by: Sam James <sam@gentoo.org> ---- a/src/base/lnav_log.hh -+++ b/src/base/lnav_log.hh -@@ -32,6 +32,7 @@ - #ifndef lnav_log_hh - #define lnav_log_hh - -+#include <cstdint> - #include <string> - - #include <stdio.h> --- -2.39.1 - diff --git a/app-admin/lnav/files/lnav-0.11.2-gcc15.patch b/app-admin/lnav/files/lnav-0.11.2-gcc15.patch new file mode 100644 index 000000000000..0b9574dde24e --- /dev/null +++ b/app-admin/lnav/files/lnav-0.11.2-gcc15.patch @@ -0,0 +1,23 @@ +https://github.com/tstack/lnav/pull/1285 +https://github.com/tstack/lnav/commit/ce97375280877f80e3dcebd20c21be44b13d8199 + +From ce97375280877f80e3dcebd20c21be44b13d8199 Mon Sep 17 00:00:00 2001 +From: David Seifert <soap@gentoo.org> +Date: Sun, 21 Jul 2024 19:38:41 +0200 +Subject: [PATCH] [build] fix for GCC 15 two-phase lookup + +* GCC 15 is more aggressive about checking dependent names + +Bug: https://bugs.gentoo.org/936409 +--- a/src/vtab_module.hh ++++ b/src/vtab_module.hh +@@ -582,7 +582,7 @@ struct vtab_module : public vtab_module_base { + struct vtab { + explicit vtab(sqlite3* db, T& impl) : v_db(db), v_impl(impl) {} + +- explicit operator sqlite3_vtab*() { return &this->base; } ++ explicit operator sqlite3_vtab*() { return &this->v_base; } + + sqlite3_vtab v_base{}; + sqlite3* v_db; + diff --git a/app-admin/lnav/lnav-0.11.1-r2.ebuild b/app-admin/lnav/lnav-0.11.1-r2.ebuild deleted file mode 100644 index 18fee38a20e9..000000000000 --- a/app-admin/lnav/lnav-0.11.1-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic - -DESCRIPTION="A curses-based tool for viewing and analyzing log files" -HOMEPAGE="https://lnav.org" -SRC_URI="https://github.com/tstack/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="pcap test" -RESTRICT="!test? ( test )" - -RDEPEND=" - app-arch/bzip2:0= - app-arch/libarchive:= - >=dev-db/sqlite-3.9.0 - dev-libs/libpcre2 - >=net-misc/curl-7.23.0 - sys-libs/ncurses:= - sys-libs/readline:= - sys-libs/zlib:= - pcap? ( net-analyzer/wireshark[tshark] )" -# The tests use ssh-keygen and use dsa and rsa keys (which is why ssl is required) -DEPEND="${RDEPEND} - test? ( - virtual/openssh[ssl] - dev-cpp/doctest - )" - -DOCS=( AUTHORS NEWS.md README ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.11.0-disable-tests.patch - "${FILESDIR}"/${PN}-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - filter-lto - - econf \ - --disable-static \ - --with-ncurses \ - $(use_with test system-doctest) -} diff --git a/app-admin/lnav/lnav-0.11.2.ebuild b/app-admin/lnav/lnav-0.11.2.ebuild index 1545017c774c..40c8357e90c0 100644 --- a/app-admin/lnav/lnav-0.11.2.ebuild +++ b/app-admin/lnav/lnav-0.11.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -36,6 +36,7 @@ DOCS=( AUTHORS NEWS.md README ) PATCHES=( "${FILESDIR}"/${PN}-0.11.0-disable-tests.patch + "${FILESDIR}"/${PN}-0.11.2-gcc15.patch ) src_prepare() { diff --git a/app-admin/lnav/metadata.xml b/app-admin/lnav/metadata.xml index 49ed98af6520..9adb44759029 100644 --- a/app-admin/lnav/metadata.xml +++ b/app-admin/lnav/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>randy@electronsweatshop.com</email> - <name>Randy Barlow</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <longdescription lang="en"> The Log File Navigator, lnav for short, is an advanced log file viewer for the small-scale. It is a terminal application that can understand your log files and make it easy for you to find diff --git a/app-admin/logcheck/files/logcheck-r4.cron b/app-admin/logcheck/files/logcheck-r4.cron new file mode 100644 index 000000000000..1a8809ffe154 --- /dev/null +++ b/app-admin/logcheck/files/logcheck-r4.cron @@ -0,0 +1,11 @@ +#!/bin/sh +# +# To enable sync via cron, execute "runuser -u logcheck touch /etc/logcheck/cron-logcheck-enabled" +if [[ ! -f /etc/logcheck/cron-logcheck-enabled ]]; then + exit +fi +if [ ! -d /var/lock/logcheck ]; then + mkdir -p /var/lock/logcheck + chown logcheck:logcheck /var/lock/logcheck +fi +/sbin/runuser -u logcheck -- nice -n10 /usr/sbin/logcheck "$@" diff --git a/app-admin/logcheck/files/logcheck.cron.d b/app-admin/logcheck/files/logcheck.cron.d new file mode 100644 index 000000000000..bd95c1a95b5c --- /dev/null +++ b/app-admin/logcheck/files/logcheck.cron.d @@ -0,0 +1 @@ +@reboot sleep 60; /etc/cron.hourly/logcheck -R diff --git a/app-admin/logcheck/logcheck-1.4.3-r4.ebuild b/app-admin/logcheck/logcheck-1.4.3-r4.ebuild new file mode 100644 index 000000000000..0cd2197b813f --- /dev/null +++ b/app-admin/logcheck/logcheck-1.4.3-r4.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit readme.gentoo-r1 systemd tmpfiles + +DESCRIPTION="Mails anomalies in the system logfiles to the administrator" +HOMEPAGE="https://logcheck.org/" +SRC_URI="https://salsa.debian.org/debian/logcheck/-/archive/debian/${PV}/logcheck-debian-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-debian-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="cron systemd" +# Test (emake system-test) requires access to system logs +RESTRICT="test" + +DEPEND=" + acct-group/logcheck + acct-user/logcheck[systemd?] +" + +RDEPEND=" + ${DEPEND} + !app-admin/logsentry + app-misc/lockfile-progs + dev-lang/perl + dev-perl/mime-construct + virtual/mailx + cron? ( sys-apps/util-linux ) +" + +DOC_CONTENTS=" + Please read the guide at https://wiki.gentoo.org/wiki/Logcheck + for installation instructions. +" + +src_prepare() { + default + # Set version from PV, without using dpkg + sed -i -e "s/^VERSION=unknown/VERSION=\"${PV}\"/" "${S}/src/logcheck" || die + + # QA-fix remove call to non existent command | Bug: #911281 + sed -i "/dpkg-parsechangelog/d" "${S}/Makefile" || die + + # Add /var/log/messages to checked logs + echo "/var/log/messages" >> "${S}/etc/logcheck.logfiles.d/syslog.logfiles" || die + + # QA-fix Remove install of empty dirs to be created at runtime + sed -i "/install -d \$(DESTDIR)\/var\/lock\/logcheck/d" "${S}/Makefile" || die + + # Comment systemd journal check if systemd use flag is not set | Bug: #913857 + if ! use systemd; then + sed -i -e "s/^journal/#journal/" "${S}/etc/logcheck.logfiles.d/journal.logfiles" || die + fi +} + +src_install() { + default + + keepdir /var/lib/logcheck + + dodoc docs/README.* + doman docs/logtail.8 docs/logtail2.8 + + if use cron; then + exeinto /etc/cron.hourly + newexe "${FILESDIR}"/"${PN}"-r4.cron ${PN} + insinto /etc/cron.d + newins "${FILESDIR}"/${PN}.cron.d ${PN} + DOC_CONTENTS="${DOC_CONTENTS}\n + \n + Read /etc/cron.hourly/logcheck.cron to activate hourly cron-based check!\n + \n + To send mail after reboot you should enable the cronjob in /etc/cron.d/logcheck." + fi + + if use systemd; then + DOC_CONTENTS="${DOC_CONTENTS}\n + \n + To enable the systemd timer, run the following command:\n + systemctl enable --now logcheck.timer" + fi + + systemd_dounit "${FILESDIR}/${PN}."{service,timer} + newtmpfiles "${FILESDIR}/logcheck.tmpfiles" logcheck.conf + + readme.gentoo_create_doc + + fowners -R logcheck:logcheck /etc/logcheck /var/lib/logcheck +} + +pkg_postinst() { + tmpfiles_process logcheck.conf + + readme.gentoo_print_elog +} diff --git a/app-admin/logmon/Manifest b/app-admin/logmon/Manifest index f094bdedbc5d..4bf8875833eb 100644 --- a/app-admin/logmon/Manifest +++ b/app-admin/logmon/Manifest @@ -1 +1,2 @@ -DIST LogMon-0.4.4.tar.bz2 65975 BLAKE2B 67f7dee996d18ef398dfbdf56c9092d2906f562aa245de0dc481eaa5c17edd8c9b300f234363641d6911cfe7b6d8c736a354e5f424eec948f0d520bb01e047ca SHA512 9ddbccfea0cae3d7fa6ffa9576f0030b6fb66e0dca152fb5242e7bd19ce319e922264720fa44f6b65319f8b25ad9e208a01434b94c629fa737bdd82ea22a4fac +DIST LogMon-0.4.4.tar.bz2 66904 BLAKE2B 2b4ba55a4a4924580d0ad1c3e7320ceb36919e9d6eab23e6fc4e03085f878db1ae49c7fb69986fbe266387c85be859a34834e2d5c81c3bdd7e116bd6710e63e2 SHA512 4d75e9664a92a196eb2d0b4e3673b87adf9d4b53d4d99c1c8a72620637f005422af4d2a008e861ea03772c1007d510fd4a9b1c9847b024af6711959680ac6edc +DIST logmon-0.4.4.r1.tar.bz2 66904 BLAKE2B 2b4ba55a4a4924580d0ad1c3e7320ceb36919e9d6eab23e6fc4e03085f878db1ae49c7fb69986fbe266387c85be859a34834e2d5c81c3bdd7e116bd6710e63e2 SHA512 4d75e9664a92a196eb2d0b4e3673b87adf9d4b53d4d99c1c8a72620637f005422af4d2a008e861ea03772c1007d510fd4a9b1c9847b024af6711959680ac6edc diff --git a/app-admin/logmon/logmon-0.4.4-r1.ebuild b/app-admin/logmon/logmon-0.4.4-r1.ebuild index 9aaa2ca57d66..a572ede4cc80 100644 --- a/app-admin/logmon/logmon-0.4.4-r1.ebuild +++ b/app-admin/logmon/logmon-0.4.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,8 +8,8 @@ inherit autotools flag-o-matic MY_P="LogMon-${PV}" DESCRIPTION="Split-screen terminal/ncurses based log viewer" HOMEPAGE="http://www.edespot.com/logmon/" -SRC_URI="http://www.edespot.com/code/LogMon/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" +SRC_URI="http://www.edespot.com/logmon/files/${MY_P}.tar.bz2 -> ${P}.r1.tar.bz2" +S="${WORKDIR}/${PV}/${MY_P}" LICENSE="Artistic" SLOT="0" diff --git a/app-admin/logmon/logmon-0.4.4-r2.ebuild b/app-admin/logmon/logmon-0.4.4-r2.ebuild new file mode 100644 index 000000000000..79b173210a7c --- /dev/null +++ b/app-admin/logmon/logmon-0.4.4-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +MY_P="LogMon-${PV}" +DESCRIPTION="Split-screen terminal/ncurses based log viewer" +HOMEPAGE="http://www.edespot.com/logmon/" +SRC_URI="http://www.edespot.com/logmon/files/${MY_P}.tar.bz2" +S="${WORKDIR}/${PV}/${MY_P}" + +LICENSE="Artistic" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +DEPEND="sys-libs/ncurses:0=" +RDEPEND="${DEPEND}" + +PATCHES=( + # Bug 119403 - should be in upstream next release + "${FILESDIR}"/${P}-char2int.diff + + # Bug 250602, gcc43 fix + "${FILESDIR}"/${P}-gcc43.patch + + # Fixes maintainer-mode detected. + "${FILESDIR}"/${P}-maintainer-mode.patch + + "${FILESDIR}"/${P}-tinfo.patch +) + +src_prepare() { + default + + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + # Uses removed 'register' keyword, bug #894206 + append-cxxflags -std=c++14 + + econf +} + +src_install() { + dobin logmon + + dodoc AUTHORS ChangeLog README TODO +} diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest index 8c9bb675f204..889283fbcb4e 100644 --- a/app-admin/logrotate/Manifest +++ b/app-admin/logrotate/Manifest @@ -1,5 +1,4 @@ -DIST logrotate-3.19.0.tar.xz 166276 BLAKE2B bb19690ca092905e527f6a0a7915373a65b29d3b50d97456ed31aa9b5b5698b3ae266c8e247a167198dcd8891a7e330f4913dfefa3563e5b2de7a6e0d067a6c3 SHA512 7838e14a5b147f6e5edf6efdf743deeca39fdb563fc6f14aa010ac5b7bdef9c2bb8005415481d1b042b31975052d5ed6e75c4bcd7e378003427ebe5ec02a1f2c -DIST logrotate-3.20.1.tar.xz 166712 BLAKE2B 8481e0d746c6bcbe10f2686a921334c6f957c8d92520927de7bc8fb0b7631a444fedaa80f35bc2de7961b3d5833ce4ab885b1298b235b7f8b33cc3ae05438da6 SHA512 a9ed5796ab254f511d0029a8f29ef7557f62e12e3ea9af24e30b5b9f348b1c1a16df26d44314b78299916fb3b5000b9cd9eed7cee2cee8df11cfd8e40c79b092 -DIST logrotate-3.20.1.tar.xz.asc 833 BLAKE2B afc02177335bcd580e0617af8c50846b371c2d00ecd8fe329c2e298dc8c48823137625f455cea3d983a0d9971733297fa2c4d98ba3c6f72d2c07f8f21108cfe4 SHA512 2dd207feec431b223ff12f09f6cce14409d45e5bb3abaf2275dd773c7ee7c59ed7d32395e5869bfed70c970be4158fd299e6e269838378843dcb63ca5ebfa029 DIST logrotate-3.21.0.tar.xz 168532 BLAKE2B f7fa0050bde51e2517eac8456ecf87648bc8423621830894ceb2a3ff6b9dfe32c5b53df6a4ee59aa91bd563ed94376a635159535f4fdc170fbc673354bcef508 SHA512 c576df7d2bc1a1db2f99befdd0ea627aef2d97bdcd4a7cdea76870623ba92fb1f04f1af6d15b75e4a9085f4aef2ae5e9843c4094cdd01e24d89872ccaf9c0d4a DIST logrotate-3.21.0.tar.xz.asc 833 BLAKE2B b2099a0b8c15d1ea7f7325884027dff08dcc8305113411448797b8089d17026242a3f10bd6d7f3d865e3e339ec6fb5faf4ff48f8fd65bca3af4da8b335c3b5f1 SHA512 8f4c1853cd84f85c796b72b43048f4cf04e3409703e7669ee91e1d1aa5e9e5c04261fac1cdf85ec303508d5b6dbf126a44eb9ec819bcc772c664830d39e1068c +DIST logrotate-3.22.0.tar.xz 172108 BLAKE2B c1c9f1ff792905d2917e9ba3cee360c50259e1520e04073cb69abe475499adcf01aeb3cb4c6933af61255fbb5978577c4fdf9d6ab6ebf9568358d2446791c7f3 SHA512 16fd95b4daef779212008c4a968c7a7130be8d550f58531d24fc04599cb9adff6323a745725b3b14d7312ad36cb6646fe33a3defdb5b70cda2cec9646aab066a +DIST logrotate-3.22.0.tar.xz.asc 833 BLAKE2B 379d4fd71c6161211234903560770cf14a7ddf769b83e76ef27ad96d1204e2f4dc73d1e44aa69401db87c252c4471d5bdbace0555dfbb66c8751c20131a7751f SHA512 93664c45bfe9ea20aedc54fe216825db38eaf81d43b238cd7bf8ea3e03f7d282f53743fb6d914766a9ed0cb5b33376435d253db5b9ec7039facd66e25d349dd4 diff --git a/app-admin/logrotate/files/logrotate-3.20.1-log-changes.patch b/app-admin/logrotate/files/logrotate-3.20.1-log-changes.patch deleted file mode 100644 index b7c4bb5275db..000000000000 --- a/app-admin/logrotate/files/logrotate-3.20.1-log-changes.patch +++ /dev/null @@ -1,147 +0,0 @@ -https://bugs.gentoo.org/847382#c3 -https://github.com/logrotate/logrotate/commit/31cf1099ab8514dfcae5a980bc77352edd5292f8 -https://github.com/logrotate/logrotate/commit/7b1fa328bf70eb8434166f151bd075cd1440d0dc - -From 31cf1099ab8514dfcae5a980bc77352edd5292f8 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka <kdudka@redhat.com> -Date: Fri, 27 May 2022 09:56:07 +0200 -Subject: [PATCH] lockState: do not print `error:` when exit code is unaffected - -Closes: https://github.com/logrotate/logrotate/pull/448 ---- a/logrotate.c -+++ b/logrotate.c -@@ -3050,8 +3050,8 @@ static int lockState(const char *stateFilename, int skip_state_lock) - } - - if (sb.st_mode & S_IROTH) { -- message(MESS_ERROR, "state file %s is world-readable and thus can" -- " be locked from other unprivileged users." -+ message(MESS_NORMAL, "warning: state file %s is world-readable" -+ " and thus can be locked from other unprivileged users." - " Skipping lock acquisition...\n", - stateFilename); - close(lockFd); - -From 7b1fa328bf70eb8434166f151bd075cd1440d0dc Mon Sep 17 00:00:00 2001 -From: Kamil Dudka <kdudka@redhat.com> -Date: Fri, 27 May 2022 16:02:57 +0200 -Subject: [PATCH] log: unify handling of log levels - -Use MESS_WARN instead of MESS_NORMAL and make it always use -the `warning:` prefix. MESS_WARN is now mapped to LOG_WARNING -for syslog. - -Also drop MESS_VERBOSE, which was not set anywhere. - -Closes: https://github.com/logrotate/logrotate/pull/239 -Closes: https://github.com/logrotate/logrotate/pull/449 ---- a/config.c -+++ b/config.c -@@ -643,7 +643,7 @@ static void set_criterium(enum criterium *pDst, enum criterium src, int *pSet) - { - if (*pSet && (*pDst != src)) { - /* we are overriding a previously set criterium */ -- message(MESS_VERBOSE, "warning: '%s' overrides previously specified '%s'\n", -+ message(MESS_DEBUG, "note: '%s' overrides previously specified '%s'\n", - crit_to_string(src), crit_to_string(*pDst)); - } - *pDst = src; -@@ -1021,7 +1021,7 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) - - if (getuid() == ROOT_UID) { - if ((sb_config.st_mode & 07533) != 0400) { -- message(MESS_NORMAL, -+ message(MESS_WARN, - "Potentially dangerous mode on %s: 0%o\n", - configFile, (unsigned) (sb_config.st_mode & 07777)); - } -@@ -1386,7 +1386,7 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) - RAISE_ERROR(); - } - } else if (!strcmp(key, "errors")) { -- message(MESS_NORMAL, -+ message(MESS_WARN, - "%s: %d: the errors directive is deprecated and no longer used.\n", - configFile, lineNum); - } else if (!strcmp(key, "mail")) { ---- a/log.c -+++ b/log.c -@@ -40,9 +40,12 @@ static void log_once(FILE *where, int level, const char *format, va_list args) - { - switch (level) { - case MESS_DEBUG: -- case MESS_NORMAL: -- case MESS_VERBOSE: - break; -+ -+ case MESS_WARN: -+ fprintf(where, "warning: "); -+ break; -+ - default: - fprintf(where, "error: "); - break; -@@ -78,10 +81,11 @@ void message(int level, const char *format, ...) - priority |= LOG_DEBUG; - break; - case MESS_DEBUG: -- case MESS_VERBOSE: -- case MESS_NORMAL: - priority |= LOG_INFO; - break; -+ case MESS_WARN: -+ priority |= LOG_WARNING; -+ break; - case MESS_ERROR: - priority |= LOG_ERR; - break; ---- a/log.h -+++ b/log.h -@@ -5,8 +5,7 @@ - - #define MESS_REALDEBUG 1 - #define MESS_DEBUG 2 --#define MESS_VERBOSE 3 --#define MESS_NORMAL 4 -+#define MESS_WARN 4 - #define MESS_ERROR 5 - #define MESS_FATAL 6 - ---- a/logrotate.c -+++ b/logrotate.c -@@ -3050,7 +3050,7 @@ static int lockState(const char *stateFilename, int skip_state_lock) - } - - if (sb.st_mode & S_IROTH) { -- message(MESS_NORMAL, "warning: state file %s is world-readable" -+ message(MESS_WARN, "state file %s is world-readable" - " and thus can be locked from other unprivileged users." - " Skipping lock acquisition...\n", - stateFilename); -@@ -3106,7 +3106,7 @@ int main(int argc, const char **argv) - POPT_AUTOHELP { NULL, 0, 0, NULL, 0, NULL, NULL } - }; - -- logSetLevel(MESS_NORMAL); -+ logSetLevel(MESS_WARN); - setlocale (LC_ALL, ""); - - optCon = poptGetContext("logrotate", argc, argv, options, 0); -@@ -3117,7 +3117,7 @@ int main(int argc, const char **argv) - switch (arg) { - case 'd': - debug = 1; -- message(MESS_NORMAL, "WARNING: logrotate in debug mode does nothing" -+ message(MESS_WARN, "logrotate in debug mode does nothing" - " except printing debug messages! Consider using verbose" - " mode (-v) instead if this is not what you want.\n\n"); - /* fallthrough */ ---- a/test/test-0080.sh -+++ b/test/test-0080.sh -@@ -10,4 +10,4 @@ cleanup 80 - preptest test.log 80 1 0 - - $RLR -d test-config.80 2>&1 | \ -- grep -q "warning: 'daily' overrides previously specified 'size'" -+ grep -q "note: 'daily' overrides previously specified 'size'" - diff --git a/app-admin/logrotate/logrotate-3.19.0.ebuild b/app-admin/logrotate/logrotate-3.19.0.ebuild deleted file mode 100644 index 461e26ab35da..000000000000 --- a/app-admin/logrotate/logrotate-3.19.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd tmpfiles - -DESCRIPTION="Rotates, compresses, and mails system logs" -HOMEPAGE="https://github.com/logrotate/logrotate" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="acl +cron selinux" - -DEPEND=">=dev-libs/popt-1.5 - selinux? ( sys-libs/libselinux ) - acl? ( virtual/acl )" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-logrotate ) - cron? ( virtual/cron )" - -STATEFILE="${EPREFIX}/var/lib/misc/logrotate.status" -OLDSTATEFILE="${EPREFIX}/var/lib/logrotate.status" - -PATCHES=( - "${FILESDIR}/${PN}-3.15.0-ignore-hidden.patch" -) - -move_old_state_file() { - elog "logrotate state file is now located at ${STATEFILE}" - elog "See bug #357275" - if [[ -e "${OLDSTATEFILE}" ]] ; then - elog "Moving your current state file to new location: ${STATEFILE}" - mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die - fi -} - -install_cron_file() { - exeinto /etc/cron.daily - newexe "${S}"/examples/logrotate.cron "${PN}" -} - -src_prepare() { - default - - sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' examples/logrotate.{cron,service} || die -} - -src_configure() { - econf \ - $(use_with acl) \ - $(use_with selinux) \ - --with-state-file-path="${STATEFILE}" -} - -src_test() { - emake test -} - -src_install() { - dobin logrotate - doman logrotate.8 - dodoc ChangeLog.md - - insinto /etc - doins "${FILESDIR}"/logrotate.conf - - use cron && install_cron_file - - systemd_dounit examples/logrotate.{service,timer} - newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf - - keepdir /etc/logrotate.d -} - -pkg_postinst() { - elog - elog "The ${PN} binary is now installed under /usr/bin. Please" - elog "update your links" - elog - - move_old_state_file - - tmpfiles_process ${PN}.conf - - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog "If you wish to have logrotate e-mail you updates, please" - elog "emerge virtual/mailx and configure logrotate in" - elog "/etc/logrotate.conf appropriately" - elog - elog "Additionally, /etc/logrotate.conf may need to be modified" - elog "for your particular needs. See man logrotate for details." - fi -} diff --git a/app-admin/logrotate/logrotate-3.20.1-r1.ebuild b/app-admin/logrotate/logrotate-3.22.0.ebuild index 83351a930bbc..9426d975db21 100644 --- a/app-admin/logrotate/logrotate-3.20.1-r1.ebuild +++ b/app-admin/logrotate/logrotate-3.22.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kamildudka.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/cgzones.asc inherit systemd tmpfiles verify-sig DESCRIPTION="Rotates, compresses, and mails system logs" @@ -13,23 +13,26 @@ SRC_URI+=" verify-sig? ( https://github.com/${PN}/${PN}/releases/download/${PV}/ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="acl +cron selinux" -DEPEND=">=dev-libs/popt-1.5 +DEPEND=" + >=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) - acl? ( virtual/acl )" -RDEPEND="${DEPEND} + acl? ( virtual/acl ) +" +RDEPEND=" + ${DEPEND} selinux? ( sec-policy/selinux-logrotate ) - cron? ( virtual/cron )" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-kamildudka )" + cron? ( virtual/cron ) +" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-cgzones )" STATEFILE="${EPREFIX}/var/lib/misc/logrotate.status" OLDSTATEFILE="${EPREFIX}/var/lib/logrotate.status" PATCHES=( "${FILESDIR}"/${PN}-3.15.0-ignore-hidden.patch - "${FILESDIR}"/${P}-log-changes.patch ) move_old_state_file() { diff --git a/app-admin/logstalgia/Manifest b/app-admin/logstalgia/Manifest index 86f5b8266148..952b9aa7aadd 100644 --- a/app-admin/logstalgia/Manifest +++ b/app-admin/logstalgia/Manifest @@ -1 +1,2 @@ DIST logstalgia-1.1.2.tar.gz 2330691 BLAKE2B 20fb549282dde860ef1db272c75360219ce4614838264a2ad7dbaa25cd3c8509f215d61ec88679165eda9619d8a3d83d9201796fa7691517ca822fa110f37d14 SHA512 e2bd41cbc6edabc1ff82d0da4ad6f749e0e6d44e5a23ea976c31d19339f56e5f693ba86b81ceee3c7590842df61d61fe69f1378711b8e7d1c30deff330cacb1e +DIST logstalgia-1.1.4.tar.gz 2341698 BLAKE2B adec0a5a9f2de3316e94bbcd5f64db44c6458f60704291b4039bd5d76421a4b9b3baf0a9a09d11183b3fb0dbcdd638ecb6af4334fdb324be14334e756cef65f1 SHA512 54036abae0b846d354edf27f39bfb4f324806d3e376d32d89df8aadf145819980d6a637a914fe400458d5fb46097990083e5cde0b2a5bb3351a99b4ad7471619 diff --git a/app-admin/logstalgia/logstalgia-1.1.4.ebuild b/app-admin/logstalgia/logstalgia-1.1.4.ebuild new file mode 100644 index 000000000000..0226cfea295c --- /dev/null +++ b/app-admin/logstalgia/logstalgia-1.1.4.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Replays or streams an access_log as a retro arcade game-like simulation" +HOMEPAGE="https://logstalgia.io/" +SRC_URI="https://github.com/acaudwell/Logstalgia/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-libs/boost:= + dev-libs/libpcre2:= + media-libs/freetype:2 + media-libs/glew:0= + media-libs/libglvnd + media-libs/libsdl2[opengl,threads(+)] + media-libs/libpng:0= + media-libs/sdl2-image[jpeg,png] + virtual/glu +" +DEPEND=" + ${RDEPEND} + media-libs/glm +" +BDEPEND=" + virtual/pkgconfig +" + +DOCS=( ChangeLog INSTALL README THANKS ) diff --git a/app-admin/logsurfer+/logsurfer+-1.8-r5.ebuild b/app-admin/logsurfer+/logsurfer+-1.8-r5.ebuild index d477332bb611..a4b8098a458e 100644 --- a/app-admin/logsurfer+/logsurfer+-1.8-r5.ebuild +++ b/app-admin/logsurfer+/logsurfer+-1.8-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ inherit toolchain-funcs DESCRIPTION="Real Time Log Monitoring and Alerting" HOMEPAGE="https://crypt.gen.nz/logsurfer/" -SRC_URI="mirror://sourceforge/logsurfer/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/logsurfer/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" LICENSE="freedist GPL-2+" diff --git a/app-admin/lsyncd/Manifest b/app-admin/lsyncd/Manifest index f13b50eed67b..e57d9dcadd25 100644 --- a/app-admin/lsyncd/Manifest +++ b/app-admin/lsyncd/Manifest @@ -1 +1,2 @@ DIST lsyncd-2.2.3.tar.gz 85165 BLAKE2B 9b3ce9ad882f12a0cf800ca0418092807c5c30451fe273eae18486b2ab245fbdc77dee937983bf78f678e20448dda39771c4bca96d8efe010cc45d470a30eba3 SHA512 2193a342f8aa7d8cfb55378c9c59ca61d2d8e4026263fd6e6560c730c712cef1f189305a3f9bca58f5b9c9ffae5af12e1d75e5355d5bdae86a47ad9595b8169a +DIST lsyncd-2.3.1.tar.gz 125126 BLAKE2B b966e2ea1887c93fe26b4fbaeedec50c4d6fd2a66eee0fbafc859a49a4b85eddc20d78ae6483be7a8f9acc66c67da3199dad757bc7b772dead2cccc9d60e621d SHA512 195cc46e00c58301aca6afb027eb0ad663254b3028bcf3e5d4fb7709bbcf2a6eb8ba9a39cae62c951eb4562795e0a147efb1ddcdd22a0b46742ec7c17f478fbe diff --git a/app-admin/lsyncd/files/lsyncd-2.3.1-cmake_lua_version.patch b/app-admin/lsyncd/files/lsyncd-2.3.1-cmake_lua_version.patch new file mode 100644 index 000000000000..e5cf18b371f0 --- /dev/null +++ b/app-admin/lsyncd/files/lsyncd-2.3.1-cmake_lua_version.patch @@ -0,0 +1,20 @@ +--- a/cmake/FindLua.cmake ++++ b/cmake/FindLua.cmake +@@ -37,7 +37,7 @@ + #SET(_POSSIBLE_LUA_LIBRARY lua) + + # Determine possible naming suffixes (there is no standard for this) +-SET(_POSSIBLE_SUFFIXES "54" "5.4" "-5.4" "53" "5.3" "-5.3" "52" "5.2" "-5.2" "") ++SET(_POSSIBLE_SUFFIXES "${LUA_ABI_VERSION}") + + # Set up possible search names and locations + FOREACH(_SUFFIX IN LISTS _POSSIBLE_SUFFIXES) +@@ -54,7 +54,7 @@ + + # Find the lua executable + FIND_PROGRAM(LUA_COMPILER +- NAMES luac5.3 ${_POSSIBLE_LUA_COMPILER} ++ NAMES ${_POSSIBLE_LUA_COMPILER} + ) + + # Find the lua header diff --git a/app-admin/lsyncd/lsyncd-2.3.1.ebuild b/app-admin/lsyncd/lsyncd-2.3.1.ebuild new file mode 100644 index 000000000000..5986c0e42b44 --- /dev/null +++ b/app-admin/lsyncd/lsyncd-2.3.1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{3,4} ) +LUA_REQ_USE="deprecated" + +inherit cmake lua-single + +DESCRIPTION="Live Syncing (Mirror) Daemon" +HOMEPAGE="https://github.com/lsyncd/lsyncd" +SRC_URI="https://github.com/lsyncd/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-release-${PV}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +DEPEND="${LUA_DEPS}" +RDEPEND="${LUA_DEPS} + net-misc/rsync" +# Both lua and luac are invoked at build time +BDEPEND="${LUA_DEPS} + app-text/asciidoc + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-cmake_lua_version.patch +) + +src_prepare(){ + cmake_src_prepare + # fix examples directory + sed -i "s@examples DESTINATION doc@examples DESTINATION share/doc/${PF}/examples@" \ + CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DLUA_ABI_VERSION=$(ver_cut 1-2 $(lua_get_version)) + ) + cmake_src_configure +} diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest index 18caefbf08d6..5595bb8b8fce 100644 --- a/app-admin/mcelog/Manifest +++ b/app-admin/mcelog/Manifest @@ -1,3 +1 @@ -DIST mcelog-195.tar.gz 318965 BLAKE2B aebfcac2a5e5aab43cf3b08d169c75469c81d8724d2e907890bb5b947e1dbea8e418fdf4c00512112ddc67d1ddcc3a014409c7a546bd60c8e36b2e7af72480c7 SHA512 45436f5859a3ffd1c0eaf998282910ad317b85d03f15130a66a2d4e32e2653dbd86b2033db7f6b321a4b9692354adb92773c26958eb5d474954e12c9ab4a9cda -DIST mcelog-196.tar.gz 318951 BLAKE2B 50871cd7a3c4dd6f4c4d613c7db4528d972ca37ba17b0a5aa4876d8fc92d4478c2247ea65748310ad6d4b950d1abc9bd0ea40193e72b36d38334547382477849 SHA512 37d14dac84792b4668cb38883cd59b7642c37abc89b783cf19c20b2664a13334372370c9a3718f26d7baf5a02344f80de9e6c6e3ff7386b9585c9dc5f332c011 -DIST mcelog-197.tar.gz 319167 BLAKE2B cbeac1b29ab0b9b7d23470213f5b186f1c1c2a1095617436ccb9a29824fbf6d461642df32e69f7d743a2b3dfce5e06fcffbe5af3cc90a99c00bf9ba4796514b7 SHA512 4975f533fa6546b956190a33f51974614911aa8b707e07f73abf1e0055cd13997eeacaeedaf84762debcea9fd9b95e7d537befc0f818ba29873dd72be4ceed1a +DIST mcelog-200.tar.gz 316893 BLAKE2B 66b6f25720d09760aab79d0b410287e73087551ab54eaf7dc31c0f7f5c56a40583e933f9e6dae9b91c5594f5bdf51701c37328e76f930c937b448aaac7acd262 SHA512 70b075d3db2f0cb587e3e8ac8b74d840b6bb777ee89c9428f70f037f67e25a02ae87889b9f998431ef229e56705a27431df016b59ab0f1ebf5485a9d38665c7b diff --git a/app-admin/mcelog/mcelog-195.ebuild b/app-admin/mcelog/mcelog-195.ebuild deleted file mode 100644 index 02b752831ace..000000000000 --- a/app-admin/mcelog/mcelog-195.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit linux-info python-any-r1 systemd toolchain-funcs - -DESCRIPTION="A tool to log and decode Machine Check Exceptions" -HOMEPAGE="http://mcelog.org/" -SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="selinux" - -RDEPEND="selinux? ( sec-policy/selinux-mcelog )" -DEPEND="${PYTHON_DEPS}" - -# TODO: add mce-inject to the tree to support test phase -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch - "${FILESDIR}"/${PN}-129-debugflags.patch -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - local CONFIG_CHECK="~X86_MCE" - kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY" - check_extra_config - fi -} - -src_prepare() { - default - tc-export CC - python_fix_shebang genconfig.py -} - -src_install() { - default - - insinto /etc/logrotate.d/ - newins ${PN}.logrotate ${PN} - - newinitd "${FILESDIR}"/${PN}.init-r1 ${PN} - systemd_dounit ${PN}.service - - dodoc *.pdf -} diff --git a/app-admin/mcelog/mcelog-196.ebuild b/app-admin/mcelog/mcelog-196.ebuild deleted file mode 100644 index 88e6cd7ea15e..000000000000 --- a/app-admin/mcelog/mcelog-196.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit linux-info python-any-r1 systemd toolchain-funcs - -DESCRIPTION="A tool to log and decode Machine Check Exceptions" -HOMEPAGE="http://mcelog.org/" -SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="selinux" - -RDEPEND="selinux? ( sec-policy/selinux-mcelog )" -DEPEND="${PYTHON_DEPS}" - -# TODO: add mce-inject to the tree to support test phase -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch - "${FILESDIR}"/${PN}-129-debugflags.patch -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - local CONFIG_CHECK="~X86_MCE" - kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY" - check_extra_config - fi -} - -src_prepare() { - default - tc-export CC - python_fix_shebang genconfig.py -} - -src_install() { - default - - insinto /etc/logrotate.d/ - newins ${PN}.logrotate ${PN} - - newinitd "${FILESDIR}"/${PN}.init-r1 ${PN} - systemd_dounit ${PN}.service - - dodoc *.pdf -} diff --git a/app-admin/mcelog/mcelog-197.ebuild b/app-admin/mcelog/mcelog-200.ebuild index 07d93a66d81f..b689f7a70a9c 100644 --- a/app-admin/mcelog/mcelog-197.ebuild +++ b/app-admin/mcelog/mcelog-200.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/snapshot/${P}.t LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="selinux" RDEPEND="selinux? ( sec-policy/selinux-mcelog )" diff --git a/app-admin/mktwpol/mktwpol-1.0.1-r1.ebuild b/app-admin/mktwpol/mktwpol-1.0.1-r1.ebuild index dab3db576eab..9fc2e7dce7f9 100644 --- a/app-admin/mktwpol/mktwpol-1.0.1-r1.ebuild +++ b/app-admin/mktwpol/mktwpol-1.0.1-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Bash scripts to install tripwire and generate tripwire policy files" HOMEPAGE="https://sourceforge.net/projects/mktwpol" -SRC_URI="mirror://sourceforge/mktwpol/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/mktwpol/${P}.tar.gz" S=${WORKDIR}/${P} LICENSE="CC-BY-SA-3.0" diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest index 590e5d21aab4..0c29b3d0e43e 100644 --- a/app-admin/mongo-tools/Manifest +++ b/app-admin/mongo-tools/Manifest @@ -1,4 +1,5 @@ DIST mongo-tools-100.4.1.tar.gz 3793073 BLAKE2B 0a5dbd7a638035e7e54922c46be4473f154f79cb6370ca72f87dfee49ea1353ebf60ccf4d324b0bc6f5388b8c095f68f423aafdf83358ac41ad59d1215dce69c SHA512 a6560f8ce2a86c1ae4400f3ef182f448991a238ef657bcd5eb6f98de0adb2cbd660a81ce00f3ca051f2db6d22a492158da9254b264424506669bf771d7a40fe6 DIST mongo-tools-100.5.1.tar.gz 3796549 BLAKE2B 6f95e1eb9f9c6c07725269f99dee0d940ffc5145e95b17b3e0a87f4cd60b1b0589a99a813c359f0b670bc34274fbd1f5b9c561caf07840bd85633174232a48ed SHA512 a488b15a6862cacaccaeb57698d423e4ee710d395b1280a66382e140cb71fec84aa738f3819a87b4a71faecd9c9da7bd92780a19d6d11fdebaf5142e594b2028 +DIST mongo-tools-100.9.4.tar.gz 4742913 BLAKE2B 12cb5b7e6c0164f5c026410a3143cd383b18ffc3498026bc568b888039980090289fc5e7ed48be292d33f3ecad38ce781fccc8db2aca6c913f567bce74de3be9 SHA512 3c857da4587d4c473b495d5bf9b5ce2e64b7fd8c831baa89b462e93f1090d297069e6be18514412c233f2dab6ed024c7db5523c1e623513734cdd0d8d6f7167f DIST mongo-tools-4.2.15.tar.gz 15028734 BLAKE2B 7479c5d0d9b6051f51e563f53a5c704a69dc3719d9417b216bcc1a65220d0ab2c9441fd24d8ac8e5b1600766797ef102df07ebfd946ee60949d3287673dfbaaf SHA512 f613ab61a4cf029548aa0e5623fef3798642ced791bf52f229e7d14d31de9472bfc3c8bfb3fa7b4542555a17c79ff9a514480c674cb3e45fb99c4f1745fdb9f0 DIST mongo-tools-4.2.17.tar.gz 15028859 BLAKE2B dfd9165bd83571cb3ae134f13072e8a06707d714f28107a70e41e8bf507f87bb44ef32a27c15c188e6b831e8c33907f201cb7a3f217868e0a88e6c31efce0f79 SHA512 e59df0593caf93b44fe5694e07e37e49e9d4237007ae33f0156f773987cbaeb59c7b3da8012f9a9b07f4eb146f8392b2d2bbcad97309284b0d67238a69af2663 diff --git a/app-admin/mongo-tools/mongo-tools-100.9.4.ebuild b/app-admin/mongo-tools/mongo-tools-100.9.4.ebuild new file mode 100644 index 000000000000..5f398ca3a28c --- /dev/null +++ b/app-admin/mongo-tools/mongo-tools-100.9.4.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A high-performance, open source, schema-free document-oriented database" +HOMEPAGE="https://www.mongodb.com" +SRC_URI="https://github.com/mongodb/mongo-tools/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv" +IUSE="kerberos sasl ssl" + +DEPEND="dev-lang/go:= + kerberos? ( app-crypt/mit-krb5 ) + sasl? ( dev-libs/cyrus-sasl ) + ssl? ( dev-libs/openssl:0= ) +" +BDEPEND="dev-lang/go:=" + +# Do not complain about CFLAGS etc since go projects do not use them. +QA_FLAGS_IGNORED='.*' + +EGO_PN="github.com/mongodb/mongo-tools" +S="${WORKDIR}/src/${EGO_PN}" + +src_unpack() { + mkdir -p "${S%/*}" || die + default + mv ${P} "${S}" || die +} + +src_compile() { + local myconf=() + + if use kerberos; then + myconf+=(gssapi) + fi + + if use sasl; then + myconf+=(sasl) + fi + + if use ssl; then + myconf+=(ssl) + fi + + # build pie to avoid text relocations wrt #582854 + local buildmode="pie" + + # skip on ppc64 wrt #610984 + if use ppc64; then + buildmode="default" + fi + + mkdir -p bin || die + for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop; do + echo "Building $i" + GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \ + -ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" -x --tags "${myconf[*]}" "$i/main/$i.go" || die + done +} + +src_install() { + dobin bin/* +} diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest index 59ef9c8e9231..be87b6778105 100644 --- a/app-admin/monit/Manifest +++ b/app-admin/monit/Manifest @@ -1,4 +1,2 @@ -DIST monit-5.29.0.tar.gz 1476102 BLAKE2B a4037c61e8d893b194317dc3c79d37f9b449d3524b91a06c0ff36a9c39016b12b0ce970c969fc10421412e6406c680714522379780cd80897a7a467f7b08450f SHA512 a69125bfa6fa9ea837f396e762a45e0cb41258c175d120c2af999ae1b500ce5cf5b57d774cc89299f70950a25ced5368c85455fffafd75677311c7912f86c49d -DIST monit-5.31.0.tar.gz 1479644 BLAKE2B 3aee9e87acb287dbf9cdc26dd5cb5e693a52d7f88c4851f9c1101aec8060df250e75890815b7ec30e58324ec118bded8e25e6a17e694bec1c028941e2cff0141 SHA512 1259c57683389d7241db9524136cec7e42067e32dac79d97753211525c6451af2768c1023535d7d894dad7c5f6e7c3b3ac77bd8540bb53634f6d72587b522d42 -DIST monit-5.32.0.tar.gz 1480629 BLAKE2B 48b824365dca349914ffc066a19758f23fee122fb29b1aed5cecad6f97799a987752e3e59cbed488282738c755fdf4d7c95dbe85069f2e070c28f03a324e0a7f SHA512 dcb56bee23c5fef4abe08a2b1633e58b60c8863b335d651d26e87f5306b4f98bd4887d2bf6311c2fc11c9b99eb853226d836b9d212ab65c0f150872c7297e005 DIST monit-5.33.0.tar.gz 1502487 BLAKE2B 770474f010067fe6388622e764a0d032495589dad24873dabd87ab0aa8edcff34d7a014a72c1c05aaa47104b12daf3dc542aa1d2d823d267814c9b5fd139e747 SHA512 f84edfc03a7386bb712c3d1e1e74801c5deea596f533bd898f342c8435e4b9f4225ec24a4daee11c4d23a5742e9f8a9c666ebaa1ba56f13842ac7214d1d70d4f +DIST monit-5.34.0.tar.gz 1486962 BLAKE2B e49e271f981d76b5d1f71818b7e6e1b1a2de56d8b1f856931c9abec053358dc6557e58fe3c37c5af9cf0f4e2c667ead5cff2ac96c6d8a2c70155cf301c6ffb44 SHA512 7e966b4437233a9be25c517620d77400bb865278975d62f6edc7d42a88d1780cbd233ce20f48da9a026b84a77d47796fb4f528409f064a99d08243ff3f3d2472 diff --git a/app-admin/monit/monit-5.29.0.ebuild b/app-admin/monit/monit-5.29.0.ebuild deleted file mode 100644 index 0787c2d3edd8..000000000000 --- a/app-admin/monit/monit-5.29.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 pam systemd - -DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system" -HOMEPAGE="http://mmonit.com/monit/" -SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux" -IUSE="ipv6 pam ssl" - -RDEPEND="sys-libs/zlib:= - virtual/libcrypt:= - pam? ( sys-libs/pam ) - ssl? ( dev-libs/openssl:0= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex -" - -src_prepare() { - default - sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die -} - -src_configure() { - local myeconfargs=( - $(use_with ipv6) - $(use_with pam) - $(use_with ssl) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - insinto /etc/logrotate.d - newins "${FILESDIR}"/monit.logrotate monit - - insinto /etc; insopts -m600; doins monitrc - newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit - systemd_dounit system/startup/${PN}.service - - use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN} - - dobashcomp system/bash/monit -} - -pkg_postinst() { - elog "Sample configurations are available at:" - elog "http://mmonit.com/monit/documentation/" -} diff --git a/app-admin/monit/monit-5.32.0.ebuild b/app-admin/monit/monit-5.32.0.ebuild deleted file mode 100644 index 253ee81a7bac..000000000000 --- a/app-admin/monit/monit-5.32.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 pam systemd - -DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system" -HOMEPAGE="http://mmonit.com/monit/" -SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux" -IUSE="ipv6 pam ssl" - -RDEPEND="sys-libs/zlib:= - virtual/libcrypt:= - pam? ( sys-libs/pam ) - ssl? ( dev-libs/openssl:0= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex -" - -src_prepare() { - default - sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die -} - -src_configure() { - local myeconfargs=( - $(use_with ipv6) - $(use_with pam) - $(use_with ssl) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - insinto /etc/logrotate.d - newins "${FILESDIR}"/monit.logrotate monit - - insinto /etc; insopts -m600; doins monitrc - newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit - systemd_dounit system/startup/${PN}.service - - use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN} - - dobashcomp system/bash/monit -} - -pkg_postinst() { - elog "Sample configurations are available at:" - elog "http://mmonit.com/monit/documentation/" -} diff --git a/app-admin/monit/monit-5.33.0.ebuild b/app-admin/monit/monit-5.33.0.ebuild index 253ee81a7bac..8c444b2a8595 100644 --- a/app-admin/monit/monit-5.33.0.ebuild +++ b/app-admin/monit/monit-5.33.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux" IUSE="ipv6 pam ssl" RDEPEND="sys-libs/zlib:= diff --git a/app-admin/monit/monit-5.31.0.ebuild b/app-admin/monit/monit-5.34.0.ebuild index 253ee81a7bac..b64d7bf782e9 100644 --- a/app-admin/monit/monit-5.31.0.ebuild +++ b/app-admin/monit/monit-5.34.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux" -IUSE="ipv6 pam ssl" +IUSE="pam ssl" RDEPEND="sys-libs/zlib:= virtual/libcrypt:= @@ -32,7 +32,6 @@ src_prepare() { src_configure() { local myeconfargs=( - $(use_with ipv6) $(use_with pam) $(use_with ssl) ) diff --git a/app-admin/needrestart/needrestart-3.6-r1.ebuild b/app-admin/needrestart/needrestart-3.6-r1.ebuild new file mode 100644 index 000000000000..d530994f324f --- /dev/null +++ b/app-admin/needrestart/needrestart-3.6-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/liske/${PN}.git" + inherit git-r3 + SRC_URI="" +else + SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +DESCRIPTION="Restart daemons after library updates" +HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart" +IUSE="systemd" +SLOT="0" +LICENSE="GPL-2+" + +RDEPEND=" + >=sys-apps/sed-4.2.2 + dev-lang/perl:= + dev-perl/libintl-perl + dev-perl/Module-Find + dev-perl/Module-ScanDeps + dev-perl/Proc-ProcessTable + dev-perl/Sort-Naturally + dev-perl/TermReadKey + !systemd? ( sys-apps/init-system-helpers ) + amd64? ( sys-apps/iucode_tool ) + x86? ( sys-apps/iucode_tool ) +" +DEPEND="${RDEPEND} + sys-devel/gettext +" + +src_install() { + default + doman man/*.1 + dodoc -r ex +} diff --git a/app-admin/needrestart/needrestart-9999.ebuild b/app-admin/needrestart/needrestart-9999.ebuild index c773506fddc2..d530994f324f 100644 --- a/app-admin/needrestart/needrestart-9999.ebuild +++ b/app-admin/needrestart/needrestart-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ fi DESCRIPTION="Restart daemons after library updates" HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart" - +IUSE="systemd" SLOT="0" LICENSE="GPL-2+" @@ -27,7 +27,7 @@ RDEPEND=" dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey - sys-apps/init-system-helpers + !systemd? ( sys-apps/init-system-helpers ) amd64? ( sys-apps/iucode_tool ) x86? ( sys-apps/iucode_tool ) " diff --git a/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r2.ebuild b/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r3.ebuild index ecc615db2851..873152bf9eb5 100644 --- a/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r2.ebuild +++ b/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r3.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="sqlite" inherit distutils-r1 @@ -17,11 +18,9 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -RDEPEND=" - dev-python/docopt[${PYTHON_USEDEP}] +RDEPEND="dev-python/docopt[${PYTHON_USEDEP}] dev-python/pyparsing[${PYTHON_USEDEP}] dev-python/tabulate[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-0.0.2-py3.patch ) diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.4.0.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.4.0-r1.ebuild index bf6db6a6c1a9..893cdb5db78e 100644 --- a/app-admin/openrc-settingsd/openrc-settingsd-1.4.0.ebuild +++ b/app-admin/openrc-settingsd/openrc-settingsd-1.4.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,7 +19,10 @@ DEPEND=" sys-apps/dbus sys-auth/polkit dev-libs/libdaemon:0= - sys-apps/openrc + || ( + sys-apps/openrc + sys-apps/openrc-navi + ) " RDEPEND=" ${DEPEND} diff --git a/app-admin/opentofu/Manifest b/app-admin/opentofu/Manifest index 214190538ece..c76804d9e981 100644 --- a/app-admin/opentofu/Manifest +++ b/app-admin/opentofu/Manifest @@ -2,3 +2,9 @@ DIST opentofu-1.6.0-deps.tar.xz 332007504 BLAKE2B 1c2a7d2350944d34308baa0566977a DIST opentofu-1.6.0.tar.gz 3696642 BLAKE2B e224ce14f04d07638d03b9a11ab251cd820acc86774f9c82f38f5bcfc38b62bbdbc70377e722a4dd2bd65f917ba0fc200ccaaeafdbd9430af66586491c7627eb SHA512 758f4ff79e526e9494e1e98dd927dbeb803b45df1f8bc15c3a9bca8343d7285b9130bfe5f19f6ddd7fd403b72d852b0d51542c058174e4bd5eed3c729b394bdb DIST opentofu-1.6.1-deps.tar.xz 332000152 BLAKE2B bfa5bee3c7ba8cc79cd8f81137fb611abce0b806813475deab0e5546542910cc391252ebb3054badf3a8bfe17f25d30ce570065591aaa6148ad6bd7c42aa8e2e SHA512 10e5519b1be53a5ec1191dec8f73960da72ca53cc5284ef9a72139ce0e1db2a9213fbed696088644414ef0fb589c26a7980f695b79192f0e5f039f3dfcfc91e8 DIST opentofu-1.6.1.tar.gz 3709010 BLAKE2B 3d172a4228ff10608dc74da6980eda38ec9afa13ac4bbfeb4ae3fb3142af81fc30988a99fea01ee7988b7ad057efbe1b270b4b880e4152ec3d87939f29ae8614 SHA512 6d98e5f03340853ad3f516ad890fe297c4239c03c0c5d4b0e7efc490b734ce2948bbd3ee5d1375d9eade2ea4a6ef71dbb22a5dd48fc81df5a9440ce73090a92e +DIST opentofu-1.6.2-deps.tar.xz 106556484 BLAKE2B fe6ed9507aa3589e34f8c3189d6ee03044b6397a650663c9746c94e45066dbc6e15529f9b4ed3c57649083580a7589596c0b710fdcf0ec832816e76d5137607e SHA512 d8c2e66ab9254d0031aa8fd7dc6fb0ef1aa748282a0b7d9d277398c2f50bceb097b52389a19b70c67d5d0abba9ef289f3d19a786436f16f7549b293bf6b46a48 +DIST opentofu-1.6.2.tar.gz 3708735 BLAKE2B 07c48de78e5510c87413447bf2393ee3e93a91ea562a28849e9db6342eccb7b85745cea0aaa3d8e3861a10127905f4b3614b77863b62a21a0a8c8f5163afac22 SHA512 25fac0e6837f2d125d35f780c3091139819a00ae3f96c2e62a1c3c544e425a60c9880c84b4e1aa6727771c5523c81e8dbab38d5151b854bbc470d7819746567c +DIST opentofu-1.7.1-deps.tar.xz 107794272 BLAKE2B cf06be88cdfe1e2b12d9f5b6c3576bb5d5fab9a05041fa60ad98a094778ab937efb5d2cc0f535f6212ed233188a4c620cc4ac80b5f58306b2dc92399d138c8b1 SHA512 d9e950cf196b93d75211593b372ecf46a6933f05a653e63c60bb1813530ddf39edce5236f1dcdc815812fbbe2b7721c237ca0cc36f3fcded523e1d213ba7ed7f +DIST opentofu-1.7.1.tar.gz 3890267 BLAKE2B c82bd4a99eb904a2dddc1c38c7a67680b3a51eb9a4a23ff618d038c4b467c7666a9801c7fb205d2f93b60ec8137a28b193347c0be43357a7397a0d98b8e1cf06 SHA512 11573449cf73e44352124463bb2dfe890688fc0bb1a232fb57a16872612c562e0fe08ed926635fc21063118d83a120febd156073c23d8dc3294e00035c660ad6 +DIST opentofu-1.7.2-deps.tar.xz 107787580 BLAKE2B 10d7f8e114ca43964de34f4ecc7d8ada24f5ac069a7568a7b843e6c6d194e767deb254af00ce722ab82ed30eb80b34689c4e004b775edbbb07c34666f1436680 SHA512 7530197f99a1dc4d0a779edff466715039bd7d5fcaa70a5158cbde33256b0d90e9f2a1f47411c13f62a257f5baf6816fec5692b9e0ec01d2704c04d5935b59b9 +DIST opentofu-1.7.2.tar.gz 3890420 BLAKE2B 7e234b535cd76b8716ed69271fd2ba13670c7ab7ae5fcff8c1e5a16097a518eee2d437772ae90b680e38adf5e64d77fdfa543f087492a36eb866405500eb3cc4 SHA512 49f93c1f7e1469b69a784424b724460c199e54c351801ef7ad3db1fea24089b585a5cf9ffef90b45ba2713d853b8d99828ceffa7c3469737bcd201b6ce34f362 diff --git a/app-admin/terraform/terraform-1.3.9.ebuild b/app-admin/opentofu/opentofu-1.6.2.ebuild index 70ddcef89c94..544c2e0b5f16 100644 --- a/app-admin/terraform/terraform-1.3.9.ebuild +++ b/app-admin/opentofu/opentofu-1.6.2.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit go-module -DESCRIPTION="A tool for building, changing, and combining infrastructure safely" -HOMEPAGE="https://www.terraform.io/" -SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +DESCRIPTION="The open source infrastructure as code tool" +HOMEPAGE="https://www.opentofu.org/" +SRC_URI="https://github.com/opentofu/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC" SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv" +KEYWORDS="~amd64" BDEPEND="dev-go/gox" @@ -24,9 +24,9 @@ src_compile() { gox \ -os=$(go env GOOS) \ -arch=$(go env GOARCH) \ - -output bin/terraform \ + -output bin/tofu \ -verbose \ - . || die + ./cmd/tofu || die } src_install() { @@ -36,5 +36,5 @@ src_install() { pkg_postinst() { elog "If you would like to install shell completions please run:" - elog " terraform -install-autocomplete" + elog " tofu -install-autocomplete" } diff --git a/app-admin/terraform/terraform-1.6.5.ebuild b/app-admin/opentofu/opentofu-1.7.1.ebuild index fff5c2bc7b23..544c2e0b5f16 100644 --- a/app-admin/terraform/terraform-1.6.5.ebuild +++ b/app-admin/opentofu/opentofu-1.7.1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit go-module -DESCRIPTION="A tool for building, changing, and combining infrastructure safely" -HOMEPAGE="https://www.terraform.io/" -SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +DESCRIPTION="The open source infrastructure as code tool" +HOMEPAGE="https://www.opentofu.org/" +SRC_URI="https://github.com/opentofu/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" -LICENSE="BUSL-1.1" +LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv" +KEYWORDS="~amd64" BDEPEND="dev-go/gox" @@ -24,9 +24,9 @@ src_compile() { gox \ -os=$(go env GOOS) \ -arch=$(go env GOARCH) \ - -output bin/terraform \ + -output bin/tofu \ -verbose \ - . || die + ./cmd/tofu || die } src_install() { @@ -36,5 +36,5 @@ src_install() { pkg_postinst() { elog "If you would like to install shell completions please run:" - elog " terraform -install-autocomplete" + elog " tofu -install-autocomplete" } diff --git a/app-admin/opentofu/opentofu-1.7.2.ebuild b/app-admin/opentofu/opentofu-1.7.2.ebuild new file mode 100644 index 000000000000..544c2e0b5f16 --- /dev/null +++ b/app-admin/opentofu/opentofu-1.7.2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit go-module + +DESCRIPTION="The open source infrastructure as code tool" +HOMEPAGE="https://www.opentofu.org/" +SRC_URI="https://github.com/opentofu/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" + +LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="dev-go/gox" + +RESTRICT="test" + +DOCS=( {README,CHANGELOG}.md ) + +src_compile() { + export CGO_ENABLED=0 + gox \ + -os=$(go env GOOS) \ + -arch=$(go env GOARCH) \ + -output bin/tofu \ + -verbose \ + ./cmd/tofu || die +} + +src_install() { + dobin bin/* + einstalldocs +} + +pkg_postinst() { + elog "If you would like to install shell completions please run:" + elog " tofu -install-autocomplete" +} diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest index 5301b99b1991..0b3274f4ef64 100644 --- a/app-admin/passwordsafe/Manifest +++ b/app-admin/passwordsafe/Manifest @@ -1,2 +1 @@ -DIST passwordsafe-1.17.0.tar.gz 15463920 BLAKE2B e64c73139c829b16b5f825d3c078f1cb3285cb15400be988e35b64e4ce701a5241e099a09092a576e487f709464b6fa5d5911f5f68e096d194329cd0214ac8cd SHA512 de1ef537c2f6c17e35d93a53cf46e86b7c1f1a4439282f8c2b98443845e3d381e113448acd739fc6ccdb5eee8ff7ebfd8c0e4306cda517ab623eaf5b9354d39d DIST passwordsafe-1.18.2.tar.gz 15613801 BLAKE2B e4ad44fe3aae6230c6a1d07e644b7b02831ec5bc815decd85050099c6f43e83bc09cd7d8f88ddfa5b63e5636db774f4b295bb34739e15115ba55c5142d3b08ae SHA512 09fb19133ff325832fa5d284aa1b1e7eda1788c4298424701132ede27fbb17956d874c0007ac00a2b9367d279175666744e192523ec79786baf626fb461abec7 diff --git a/app-admin/passwordsafe/passwordsafe-1.17.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.17.0.ebuild deleted file mode 100644 index fb5458c1a459..000000000000 --- a/app-admin/passwordsafe/passwordsafe-1.17.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WX_GTK_VER="3.0-gtk3" - -inherit cmake desktop optfeature wxwidgets xdg - -MY_PV="${PV/_beta/BETA}" -DESCRIPTION="Password manager with wxGTK based frontend" -HOMEPAGE="https://pwsafe.org/ https://github.com/pwsafe/pwsafe/" -SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/pwsafe-${MY_PV}" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" -IUSE="qr test +xml yubikey" -RESTRICT="!test? ( test )" - -RDEPEND=" - net-misc/curl - sys-apps/util-linux - x11-libs/libXt - x11-libs/libXtst - x11-libs/wxGTK:${WX_GTK_VER}[X] - qr? ( media-gfx/qrencode ) - xml? ( dev-libs/xerces-c ) - yubikey? ( sys-auth/ykpers )" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -BDEPEND=" - app-arch/zip - dev-lang/perl - sys-devel/gettext - virtual/pkgconfig - test? ( dev-cpp/gtest )" - -src_configure() { - setup-wxwidgets - - local mycmakeargs=( - -DNO_QR=$(usex !qr) - -DNO_GTEST=$(usex !test) - -DGTEST_BUILD=OFF - -DXML_XERCESC=$(usex xml) - -DNO_YUBI=$(usex !yubikey) - ) - - cmake_src_configure -} - -src_install() { - pushd "${BUILD_DIR}" || die - - dobin pwsafe - dobin cli/pwsafe-cli - dosym pwsafe /usr/bin/${PN} - dosym pwsafe-cli /usr/bin/${PN}-cli - - insinto /usr/share/locale - doins -r src/ui/wxWidgets/I18N/mos/* - - insinto /usr/share/${PN}/help - doins help/*.zip - - popd || die - - newman docs/pwsafe.1 ${PN}.1 - - dodoc README.md README.LINUX.* SECURITY.md docs/{ReleaseNotes.md,ChangeLog.txt} - - insinto /usr/share/${PN} - doins -r xml - - doicon -s 48 install/graphics/pwsafe.png - newmenu install/desktop/pwsafe.desktop ${PN}.desktop -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - optfeature "on-screen keyboard for password entry" x11-misc/xvkbd -} diff --git a/app-admin/passwordsafe/passwordsafe-1.18.2.ebuild b/app-admin/passwordsafe/passwordsafe-1.18.2.ebuild index bb09079ca4f2..9581dc5e6d16 100644 --- a/app-admin/passwordsafe/passwordsafe-1.18.2.ebuild +++ b/app-admin/passwordsafe/passwordsafe-1.18.2.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/pwsafe-${MY_PV}" LICENSE="Artistic-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="qr test +xml yubikey" RESTRICT="!test? ( test )" diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest index c71b5fdc3041..c30f5f7e453f 100644 --- a/app-admin/perl-cleaner/Manifest +++ b/app-admin/perl-cleaner/Manifest @@ -1,2 +1 @@ -DIST perl-cleaner-2.30.tar.bz2 6963 BLAKE2B 8983060c7a904266ac82a67eba7b5d2184803b59c077f947a35d07e9af3046953705d31840b9508116578b8f3e8a8b97d77cf21eeac3b70f1c3fb5c1d71ae64e SHA512 436d26727bbb598bcd3c4f31e6b81e415a797cdba82dccfd55e54ee179bd2d6c1dc443e865f6f0a05b59f47ffd231dd10e55d5ea97a9a6875235ea1b49b68898 DIST perl-cleaner-2.31.tar.bz2 6914 BLAKE2B 4b13ae42ab06ad75b6dbcb1306f3f4f476315db4504d0ffbc4c56d4d66a2da3a751d3682305daca6bcbae1861d182f16296c92f9a8d25687e35ab03a6f8734e3 SHA512 c4df0437604d41dbfdce0b72d72f975d464cf0c44f417c708917f01829e498ef8d6b47a78cee517836cac9344791ad49db98f29da5f78599e80b000e41b8127e diff --git a/app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild index 0991130f6f12..c8d659c9e0b4 100644 --- a/app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild +++ b/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,14 +12,12 @@ if [[ "${PV}" == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git" else - SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" SLOT="0" -# TODO: Detect at runtime what's available and fallback if needed, possibly -# integrate with eselect-package-manager, bug #779007. IUSE="pkgcore" [[ "${PV}" == "9999" ]] && BDEPEND="sys-apps/help2man" diff --git a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild index b7bf446c4729..c8d659c9e0b4 100644 --- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild +++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/app-admin/petrovich/petrovich-1.0.0-r2.ebuild b/app-admin/petrovich/petrovich-1.0.0-r2.ebuild index f3ec7ada6321..bc557200d6cb 100644 --- a/app-admin/petrovich/petrovich-1.0.0-r2.ebuild +++ b/app-admin/petrovich/petrovich-1.0.0-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Filesystem Integrity Checker" HOMEPAGE="https://sourceforge.net/projects/petrovich" -SRC_URI="mirror://sourceforge/petrovich/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/petrovich/${P}.tar.gz" S="${WORKDIR}/${PN}" LICENSE="GPL-2" diff --git a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r2.ebuild b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r2.ebuild index d9384bee0dd8..5b64d0931d9a 100644 --- a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r2.ebuild +++ b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools flag-o-matic DESCRIPTION="Completely rewrite of the old system monitoring app procinfo" HOMEPAGE="https://sourceforge.net/projects/procinfo-ng/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2" LICENSE="|| ( GPL-2 LGPL-2.1 )" SLOT="0" diff --git a/app-admin/ps_mem/ps_mem-3.14-r1.ebuild b/app-admin/ps_mem/ps_mem-3.14-r1.ebuild index 59f3c0578f52..b5474c4c3e05 100644 --- a/app-admin/ps_mem/ps_mem-3.14-r1.ebuild +++ b/app-admin/ps_mem/ps_mem-3.14-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# 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_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 @@ -16,7 +16,6 @@ SRC_URI="https://github.com/pixelb/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P} LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 ~arm64 ppc64 sparc x86" -IUSE="" python_install() { distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin" diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest index 7893bb38e31c..d172a2c2a202 100644 --- a/app-admin/puppet-agent/Manifest +++ b/app-admin/puppet-agent/Manifest @@ -1,8 +1,6 @@ DIST puppet-agent_7.24.0-1focal_amd64.deb 31418478 BLAKE2B 201c0a5adbeca2b6f572d3f8b89df06314171e5c7bb95f574311cee5af1910bdf7f5574eaa5f514bcf0c1ceb5c04c30a2079069183c4b37dd90581596a70092e SHA512 7912360597c21abf048d578783262821210d6568dc41f79b2d21cdb08851f8bd4cbe5a6114aa8af302c9046de424b8b15fe34be1fc51b529f36ccb99445bc7dc DIST puppet-agent_7.24.0-1focal_arm64.deb 31160744 BLAKE2B 22dfc3f0855c2e88c7202f2a9d98efd4ad9ef3a191ab9b5b8c37a6869306a47d1225d568fec9f0fc52cdf236f8258b5ca206a360049cc39e1825f1f8afc5d4af SHA512 db1b7cb25a04d6aeedd7f3bb125fe0fcac420c2881f9f3aba729143e253908376cd118073753de018d8fd1a6d7f38139766b4ec4bfb23f840ca7ee32143a8a48 -DIST puppet-agent_8.3.1-1focal_amd64.deb 35930206 BLAKE2B 8a636bfd9a76a364f03022a587bbe9bd8a596515d515cc41c1eb4d96f930366191df54217444cb4a7a471e201f5ac9673e101b1a3697a55abfc7e2b19ac9a45c SHA512 b455e4dd539159e568aa68acbb993e3c94a3d2724e8bdc9056a28c79737d54981c891bfb0d0e7084dd6c16bb13580eb535aacfe6dff34f9bf3ea6da32cfbe08b -DIST puppet-agent_8.3.1-1focal_arm64.deb 35420834 BLAKE2B b95702ba60df28ca511c7ea1efeacf7b537d666987e76f83048552667d0ee1ae41041166d07f41a6d1f0e1e6eceea9af427c8e4feef0efa1108b33edf2b64001 SHA512 89d0183dd8762ec9e96ca218d179a5c6278c6b106e4679370dac5b96beb5bb6ec5c18f52a6d076a7ae71f9bbcb9466351b65f096b5c961cb6d8f03a2c7fe171e -DIST puppet-agent_8.4.0-1focal_amd64.deb 35930626 BLAKE2B ad299aaceba51bd2831c6aa15a1794c12e03026866e7b1fd59c49d078d7c32bc8af2f0eba9f699f21e0bde98147b3a7edb88db3ada2ec8cb9601c2ed64210240 SHA512 18148a6cbd237afc66bbce1bc5d9eec63426efd5d7a2625e4f8a7d962a97c25da7e5ef208972323ea10e35c174beaacacc131d7dd1043a9013f1d8c8ae8a8c70 -DIST puppet-agent_8.4.0-1focal_arm64.deb 35421066 BLAKE2B 348f4cb16b83e0703fe8ec1fc6a5ebd992384c02f51b8d38d597d629b19f070f21e0f944ba1c6188bd9d93d0689e66ef10a4c717847ffca2534b4c6a3fa0eb4d SHA512 5ba2d6d41e6d98e0e7830fc6140500173e1e18efd9c228c84ec124c5154df847657f4c43f994d05830774fc6431b49d57081ded579ed1215927623c7b83155a7 -DIST puppet-agent_8.5.0-1focal_amd64.deb 35945720 BLAKE2B 485fa3e93006c63265df27ba99e61e1c9b253f71976aa92af1bc0ee474b575c27d3e1d3ddde21a919f5a21e151777b1ab8f7d849f5927a48898ca58b14edaa8b SHA512 a252240e206fb93bfc882f88e593a93b29c61442bb7fc95e1d3465e30af6b7bd82a362287590a36460ed04d4759fc244d3eff118ef8790885112ef78206a14f9 -DIST puppet-agent_8.5.0-1focal_arm64.deb 35436786 BLAKE2B 712f893f05f9f75bf7af0cf40556f0746a81fabbd8e588ad598f59856bfe4948c53eb92e2eaa7a621507183c572d17ecb2b426b13a91bbd0b98cc2463070a60e SHA512 ce1752d13b2d4b9442ef11006e8bc0edf98e855df051491efd2760b6919c41f0dda2030910e5794658ae99d3b8341e9bf64aa57c65069f9d83a3f328f1d2dd41 +DIST puppet-agent_8.5.1-1focal_amd64.deb 35945834 BLAKE2B 8c839eabf8abbc6cf87ab8a1c942b97be7fc08b9053695d07a7fc4bbf69886192063553c43f81e73521327cf8b89af18fe43d41ef3f71229d218fe123426f50c SHA512 324ea532d005a1bbb0f25fdd411f3f68a1c18371cb494f8934d73d87c19e3bbf46c653a9afbe767ed2ab6e788115f31ccef4bd084351ee6f73e4e656aab5d65a +DIST puppet-agent_8.5.1-1focal_arm64.deb 35436770 BLAKE2B 16ead6317dab6f8b65b8ea5269eec5593697f4da6d1ec0323e074f4eab3c8518dab10af48853e591aecc62c63a5ff4e135cf02bb1d7f7d565c5200bfae98ff86 SHA512 f3acc097563d9a56cb677df72250ee25ab0e1e361eb40a2cd36b3d694854edc3850f08099b916aefbc16580f78a194e9f3bf33b1cb585836d55c6e8dcf03a379 +DIST puppet-agent_8.6.0-1focal_amd64.deb 35966100 BLAKE2B a27e5fd32c73dd798612cc78a2e4abc150b425215592e9c7a88c7d3b54a2f6dcaffd557575e7c6f64116228fdd50e15a503f8b4c8c496c0f970ee772d5a88e6c SHA512 10a89f73219da6b59e63e8d2aba63968ef2236e773077c54ef6001b010b20b3e384676880cc10b8be4fc16336bb123783de88b0fd1d5c5d91c2455f410458363 +DIST puppet-agent_8.6.0-1focal_arm64.deb 35459524 BLAKE2B 5c9bc90eb3b2857176988acb41ebf0eed173077adabe74a6570ada92f9c2c829a57b949ea0c1cb1cae2e7b562b52882da58fab1552934e18bd676163c10e1924 SHA512 f91d82dcb66667891c6155e171739f34a174529a09c376fc7e1a829cd6862e52d26dc39ab3b0d273e32b56e52c62193c8d574d5164f3152bab6e50b4872c5e52 diff --git a/app-admin/puppet-agent/puppet-agent-8.5.0.ebuild b/app-admin/puppet-agent/puppet-agent-8.5.0.ebuild deleted file mode 100644 index f5524d744e1b..000000000000 --- a/app-admin/puppet-agent/puppet-agent-8.5.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit systemd unpacker tmpfiles - -DESCRIPTION="general puppet client utils along with hiera and facter" -HOMEPAGE="https://puppetlabs.com/" -SRC_URI="amd64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb ) -arm64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_arm64.deb )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="puppetdb selinux" -RESTRICT="strip" - -# virtual/libcrypt:= is in here despite being a pre-built package -# to ensure that the has_version logic for the symlink doesn't become stale -CDEPEND="!app-admin/puppet - !dev-ruby/hiera - !dev-ruby/facter - app-emulation/virt-what - acct-user/puppet - acct-group/puppet - virtual/libcrypt:=" - -DEPEND=" - ${CDEPEND} - app-admin/augeas" -RDEPEND="${CDEPEND} - app-portage/eix - sys-apps/dmidecode - sys-libs/libselinux - sys-libs/glibc - sys-libs/readline:0/8 - sys-libs/libxcrypt[compat] - sys-libs/ncurses:0[tinfo] - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )" - -S=${WORKDIR} - -QA_PREBUILT="*" - -src_install() { - # conf.d - doconfd etc/default/puppet - doconfd etc/default/pxp-agent - # logrotate.d - insinto /etc/logrotate.d - doins etc/logrotate.d/pxp-agent - # puppet itself - insinto /etc/puppetlabs - doins -r etc/puppetlabs/* - # logdir for systemd - keepdir var/log/puppetlabs/puppet/ - chmod 0750 var/log/puppetlabs/puppet/ - # the rest - insinto /opt - dodir opt/puppetlabs/puppet/cache - doins -r opt/* - fperms 0750 /opt/puppetlabs/puppet/cache - # init - newinitd "${FILESDIR}/puppet.initd2" puppet - systemd_dounit lib/systemd/system/puppet.service - systemd_dounit lib/systemd/system/pxp-agent.service - newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf - # symlinks - chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" - dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter - dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera - dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet - - # Handling of the path to the crypt library during the ongoing migration - # from glibc[crypt] to libxcrypt - # https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html - if has_version "sys-libs/glibc[crypt]"; then - local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1' - else - local crypt_target='../../../../usr/lib/libcrypt.so.1' - fi - dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1 -} - -pkg_postinst() { - tmpfiles_process puppet-agent.conf -} diff --git a/app-admin/puppet-agent/puppet-agent-8.3.1-r1.ebuild b/app-admin/puppet-agent/puppet-agent-8.5.1.ebuild index 32089749d68e..32089749d68e 100644 --- a/app-admin/puppet-agent/puppet-agent-8.3.1-r1.ebuild +++ b/app-admin/puppet-agent/puppet-agent-8.5.1.ebuild diff --git a/app-admin/puppet-agent/puppet-agent-8.4.0-r1.ebuild b/app-admin/puppet-agent/puppet-agent-8.6.0.ebuild index 32089749d68e..32089749d68e 100644 --- a/app-admin/puppet-agent/puppet-agent-8.4.0-r1.ebuild +++ b/app-admin/puppet-agent/puppet-agent-8.6.0.ebuild diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest index 9b60d332f792..4c98387cef43 100644 --- a/app-admin/puppet-lint/Manifest +++ b/app-admin/puppet-lint/Manifest @@ -1,6 +1,5 @@ -DIST puppet-lint-3.4.0.gem 83456 BLAKE2B fa6b274b3e6e84095fdaff6f024864dc301f0afc605198cc40b4dd8df7a9de66adfb91982195af9a0ad35301409c23e99d8d6ba5d3c43d3ee4dd57235de2b8cc SHA512 47c025ef925618cba3c1f579a3ef62bd5f9fd8ee7f8f9a68ed84daafeb7f9071e558619b24f0a249fcbe85d8c1b27e715938cc352792f9aa91de131820103e9c -DIST puppet-lint-4.0.0.gem 80896 BLAKE2B 6e674deaec43c3b45e2c162ef3d09648bd3cdd589a3ae6ce92e21617633529705fe9999f4c6c361c3c1f041a3d25d1a03079f2f97705c01199253661bc9355dc SHA512 a23d316f60cb7d34c394bdaee0ad08070098d732210a92294a3d330cff7330aefe2be6bd9a60219d7538173c2f187c1ed427c6671a345f868286986164ea3a33 DIST puppet-lint-4.2.1.gem 81920 BLAKE2B 5e291e4c1743092be9935231280f04ce3affdc1d530180f26a6ace0535a15e11bc9b33dd89d8eeafb44ebc7cae16f2656e293a6e8e8fbc4fd2cfde896996d59a SHA512 d39a287d3ae0ecbf27254c289e73918b62b50bbf8f44f51248e5e8042b194c32facd1215d7b24ab768714aeb9ae58647964bdc8b8b4650d1cebe6e2e749d782c DIST puppet-lint-4.2.2.gem 81920 BLAKE2B cad796866f323113a8c2aa5cf86b6187423f27186032ea76ebd1f158937c34f315d93de3d92b01acc0b160947b720bd987550c52aaa53a51f165396de776ec88 SHA512 e8a591e615db87dc2edc22fc4d53c03004e0227748896005d2252fab8b77193ecd30f9167702c6c4fd6551daaa0894789f3d9d50fb705eecaed4a22573a94afc DIST puppet-lint-4.2.3-pr181-fix-warnings.patch 5601 BLAKE2B a04fdf9d8627cc888924b4282a09e076d7e029eda008fc8da138a121a21e227cff45a54ddbe770a286a2a15e43d4402526a6201c805f6e574755a11a1d13d7d7 SHA512 15638f2d4a81c969aa77b51f2f147a1fba5544dd7e52f3127dc9949afaabbd161f815a22dc5091f19d3d16bc2be97bb50f455a3a67c503aff58e737288f80e49 DIST puppet-lint-4.2.3.gem 81920 BLAKE2B ee98aaed336a4302c4d67d94c83f30f6fdfc111192b483f39a2c096f00daff2f7caf54bfa11c4b8217648a0ca68c6c8da5a4a6f2d0cab8efb6e2d7e814155780 SHA512 2f2192a48ed460371092ce99755b8cde55526ed96ee72d2a5b7989f7df7afb6abce5d3e8e7a0dca577b199bb380935e8734a92a53248697bb7195091da4cb9f6 +DIST puppet-lint-4.2.4.gem 82432 BLAKE2B 54bd65b917c184163adca920767b88d064cdd8c931d7911a64698d68a7b335055bd95bff91c462ecaf4111a231186ee5d2f2de42a04abffb519a67a4825bec59 SHA512 19b28de4e5d183dd46727cc4f7f7a6b81eb5ec7d0c7ca23514a015e43a7528bfc110853b82e65ac5da4d002abc3c21ce5d10abb6a97717b540d13570fd42eb6b diff --git a/app-admin/puppet-lint/puppet-lint-3.4.0.ebuild b/app-admin/puppet-lint/puppet-lint-3.4.0.ebuild deleted file mode 100644 index a45d6de2d480..000000000000 --- a/app-admin/puppet-lint/puppet-lint-3.4.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -USE_RUBY="ruby30 ruby31 ruby32" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_EXTRADOC="README.md" - -RUBY_FAKEGEM_BINWRAP="puppet-lint" - -inherit ruby-fakegem - -DESCRIPTION="A linter for puppet DSL" -HOMEPAGE="https://github.com/puppetlabs/puppet-lint" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~x86" - -ruby_add_bdepend "test? ( - dev-ruby/rspec-its:1 - dev-ruby/rspec-collection_matchers:1 - dev-ruby/rspec-json_expectations )" - -all_ruby_prepare() { - # Skip acceptance tests due to unpackages puppet_litmus which in turn - # has a number of unpackaged dependencies. - rm -rf spec/acceptance || die - rm -f spec/spec_helper_acceptance.rb || die -} diff --git a/app-admin/puppet-lint/puppet-lint-4.2.3.ebuild b/app-admin/puppet-lint/puppet-lint-4.2.3.ebuild index b57aa7a47bc0..a97d8ebb1616 100644 --- a/app-admin/puppet-lint/puppet-lint-4.2.3.ebuild +++ b/app-admin/puppet-lint/puppet-lint-4.2.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby31 ruby32" +USE_RUBY="ruby31 ruby32 ruby33" RUBY_FAKEGEM_RECIPE_TEST="rspec3" diff --git a/app-admin/puppet-lint/puppet-lint-4.0.0.ebuild b/app-admin/puppet-lint/puppet-lint-4.2.4.ebuild index a45d6de2d480..59d8d9af62c5 100644 --- a/app-admin/puppet-lint/puppet-lint-4.0.0.ebuild +++ b/app-admin/puppet-lint/puppet-lint-4.2.4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby30 ruby31 ruby32" +USE_RUBY="ruby31 ruby32 ruby33" RUBY_FAKEGEM_RECIPE_TEST="rspec3" @@ -17,7 +17,14 @@ HOMEPAGE="https://github.com/puppetlabs/puppet-lint" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="~amd64 ~x86" + +PATCH_NAME="${PN}-4.2.3-pr181-fix-warnings.patch" +#SRC_URI+=" https://github.com/puppetlabs/puppet-lint/pull/181.patch -> ${PATCH_NAME} " + +#PATCHES=( +# "${DISTDIR}/${PATCH_NAME}" +#) ruby_add_bdepend "test? ( dev-ruby/rspec-its:1 diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest index 18a8ec8de431..c8a2bdc1a3f3 100644 --- a/app-admin/puppet/Manifest +++ b/app-admin/puppet/Manifest @@ -1,6 +1,3 @@ -DIST puppet-7.24.0.tar.gz 2823083 BLAKE2B f4a3862153a01b1d5ce1cc9d72a2446d91346c5e8ed762f8aeae260a67bd583c277cd4ea0f207021057d40c69078add06af88978522706dea59796bdd6071070 SHA512 bb881e7523fce72ca8941d363ebc12f0172aff61a28d49465b7977fdf0d004575f5677fad3f0858db109b1cf85e4d870becdaa7c6687db32eb6eecf849ed25e9 -DIST puppet-7.27.0.tar.gz 2825666 BLAKE2B dffc2329c28588a5b4a08996f5fbff95c092961aa68af6287c4216ffb3e5b6ab811df876b8efb0f6724d9990b21ad1c56d65bd9fd8d502008ba385f4460f0591 SHA512 a864357f5079c9fad53c2cff35f73f0bc25900359e25b5fb1130e3a3e6f77f63bc38ef59c0ce1b37913eb0acb1e42f39891ed7de0fe39ab138faa426ab2a9392 DIST puppet-7.28.0.tar.gz 2827538 BLAKE2B 65f25d9de60ed1b511acb5c9d72370198f68f3158cfede2ffda90ee23ebcfecfdabcf35459d1a048c3a204e13611f67852028233e4da4b9ed2ea08cad07a37c9 SHA512 d570452ceec764c657f4678f7179400d30f8513766edc6f020db35c3a4246c1d857615a647ca481920a7d1a40cf9a15057432468ccd4697e4335dca55e121faa -DIST puppet-8.3.1.tar.gz 2879699 BLAKE2B 6710d345714e6400ef04aeac8dedb933f39443688bda0b24316a3456a6c6bf2719286472a0ce764ddafd40754f8cd95767a4c311c5b5e2bd72b8bc92ec4d0e85 SHA512 0aff032caf7a3966f7e369d6f1785f0ada16e419f96f34dafee61457d2e97979b7934195eb356e44ef323401fa40be5eef608a175b3c2907f25ca92901ec81d2 -DIST puppet-8.4.0.tar.gz 2882328 BLAKE2B de46a8fbdc7522f022d19953845c73e6872ed430a9380f157809bb95e7d7315063f136b5159468708dcb5dcb4353cc89eacffffbd4045458351c63261a6d9bd0 SHA512 23d5aede9ba55e4e63a7f815fd1d274e97d5d0c35aa1b5444c24b223a59d5d913ac5b4652acc2258b1721a213e4c24e1e8b4a146ca6a1b81a1536a51ed856270 -DIST puppet-8.5.0.tar.gz 1565122 BLAKE2B c787b981c64f2b52cc3c8998516599891980bb176cb3bce6596cb4b139fbae2f58e156fb007a3aa2bd2a5bb069dc63eb7fc36bde3f3533c27729fccfa19ee0e7 SHA512 1adf88f69b3b5a7071a2ee5dad66c3cd3fc1db57fdeaf7945f8cb167d1b76dcf12e85e17eefc418cda67952a4c75a6b43d320d0c0f1db610411d188304994cdc +DIST puppet-8.5.1.tar.gz 1565085 BLAKE2B f352f9f70e090c4a32edd45ced5c01ed4eff891fb46c0f2d753ceeba43250960356ceb2d9047e7308732585ec114c5f728ec29a65b6a08348b74a9709ec92a89 SHA512 f1d661c34fc7c1381c6422ff7e027fdf4554a69939f5db926bf8a61a89583090fb8d28151f90093d3ca8037950ed911b0a5c7b8677a80ede72e83d9cbf89af7f +DIST puppet-8.6.0.tar.gz 1567398 BLAKE2B 749cc055c6797e5715907fdb768264774efba62e4681733a59a457cfda9dd2682990a96331cc04d313a367e32b820ce351fb103e19891976e900d99c30ca7ba5 SHA512 b08d59b4ec79fec5f3dd2d37c9b6a9f016cf25068e507866ab8d545f59792b9af84e302675182a0318c792814f0bff2bf052c8953b6b44c5441fa2c692a9f04d diff --git a/app-admin/puppet/puppet-7.24.0-r1.ebuild b/app-admin/puppet/puppet-7.24.0-r1.ebuild deleted file mode 100644 index e6415c71f2b2..000000000000 --- a/app-admin/puppet/puppet-7.24.0-r1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -USE_RUBY="ruby27 ruby30 ruby31" -RUBY_FAKEGEM_RECIPE_TEST="rspec3" -RUBY_FAKEGEM_TASK_DOC="doc:all" -RUBY_FAKEGEM_EXTRAINSTALL="locales" - -inherit ruby-fakegem systemd tmpfiles - -DESCRIPTION="A system automation and configuration management software" -HOMEPAGE="https://puppet.com/" -SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" -IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" -RESTRICT="test" - -# <dev-ruby/concurrent-ruby-1.2 for bug #900206 -# - https://tickets.puppetlabs.com/browse/PUP-11722 (workaround, pinning) -# - https://tickets.puppetlabs.com/browse/PUP-11723 (bug for fixing the pinning) -ruby_add_rdepend " - dev-ruby/hiera - dev-ruby/json:= - dev-ruby/semantic_puppet - >=dev-ruby/facter-3.0.0 - <dev-ruby/concurrent-ruby-1.2 - augeas? ( dev-ruby/ruby-augeas ) - diff? ( dev-ruby/diff-lcs ) - doc? ( dev-ruby/rdoc ) - ldap? ( dev-ruby/ruby-ldap ) - shadow? ( dev-ruby/ruby-shadow ) - sqlite? ( dev-ruby/sqlite3 ) - virtual/ruby-ssl - dev-ruby/hocon" - -ruby_add_bdepend " - doc? ( dev-ruby/yard ) - test? ( - dev-ruby/mocha - dev-ruby/rack - dev-ruby/rspec-its - )" -# this should go in the above lists, but isn't because of test deps not being keyworded -# dev-ruby/rspec-collection_matchers - -RDEPEND+=" ${RDEPEND} - rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) - >=app-portage/eix-0.18.0 - acct-user/puppet - acct-group/puppet" -PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" - -all_ruby_prepare() { - # Avoid spec that require unpackaged json-schema. - rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die - - # fix systemd path - eapply -p0 "${FILESDIR}/puppet-systemd.patch" - - # Avoid specs that can only run in the puppet.git repository. This - # should be narrowed down to the specific specs. - rm spec/integration/parser/compiler_spec.rb || die - - # Avoid failing spec that need further investigation. - rm spec/unit/module_tool/metadata_spec.rb || die -} - -each_ruby_install() { - each_fakegem_install -# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \ -# "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" -} - -all_ruby_install() { - all_fakegem_install - - # systemd stuffs - systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" - - # tmpfiles stuff - newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf" - - # openrc init stuff - newinitd "${FILESDIR}"/puppet.init puppet - - keepdir /etc/puppetlabs/puppet/ssl - - keepdir /var/lib/puppet/facts - keepdir /var/lib/puppet/files - fowners -R puppet:puppet /var/lib/puppet - - fperms 0750 /var/lib/puppet - - fperms 0750 /etc/puppetlabs - fperms 0750 /etc/puppetlabs/puppet - fperms 0750 /etc/puppetlabs/puppet/ssl - fowners -R :puppet /etc/puppetlabs - fowners -R :puppet /var/lib/puppet - - # ext and examples files - for f in $(find ext examples -type f) ; do - docinto "$(dirname ${f})" - dodoc "${f}" - done -} - -pkg_postinst() { - tmpfiles_process puppet.conf - - elog - elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" - elog "cause puppet to hang while installing packages." - elog - elog "Portage Puppet module with Gentoo-specific resources:" - elog "http://forge.puppetlabs.com/gentoo/portage" - elog - elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)" - elog "suppert was removed for >=6.x, please migrate to puppetserver if you have" - elog "not already done so." - elog -} diff --git a/app-admin/puppet/puppet-7.27.0-r1.ebuild b/app-admin/puppet/puppet-7.27.0-r1.ebuild deleted file mode 100644 index b23327410b34..000000000000 --- a/app-admin/puppet/puppet-7.27.0-r1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -USE_RUBY="ruby27 ruby30 ruby31" -RUBY_FAKEGEM_RECIPE_TEST="rspec3" -RUBY_FAKEGEM_TASK_DOC="doc:all" -RUBY_FAKEGEM_EXTRAINSTALL="locales" - -inherit ruby-fakegem systemd tmpfiles - -DESCRIPTION="A system automation and configuration management software" -HOMEPAGE="https://puppet.com/" -SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" -IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" -RESTRICT="test" - -ruby_add_rdepend " - dev-ruby/hiera - dev-ruby/json:= - dev-ruby/semantic_puppet - >=dev-ruby/facter-3.0.0 - dev-ruby/concurrent-ruby - augeas? ( dev-ruby/ruby-augeas ) - diff? ( dev-ruby/diff-lcs ) - doc? ( dev-ruby/rdoc ) - ldap? ( dev-ruby/ruby-ldap ) - shadow? ( dev-ruby/ruby-shadow ) - sqlite? ( dev-ruby/sqlite3 ) - virtual/ruby-ssl - dev-ruby/hocon" - -ruby_add_bdepend " - doc? ( dev-ruby/yard ) - test? ( - dev-ruby/mocha - dev-ruby/rack - dev-ruby/rspec-its - )" -# this should go in the above lists, but isn't because of test deps not being keyworded -# dev-ruby/rspec-collection_matchers - -RDEPEND+=" ${RDEPEND} - rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) - >=app-portage/eix-0.18.0 - acct-user/puppet - acct-group/puppet" -PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" - -all_ruby_prepare() { - # Avoid spec that require unpackaged json-schema. - rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die - - # fix systemd path - eapply -p0 "${FILESDIR}/puppet-systemd.patch" - - # Avoid specs that can only run in the puppet.git repository. This - # should be narrowed down to the specific specs. - rm spec/integration/parser/compiler_spec.rb || die - - # Avoid failing spec that need further investigation. - rm spec/unit/module_tool/metadata_spec.rb || die -} - -each_ruby_install() { - each_fakegem_install -# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \ -# "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" -} - -all_ruby_install() { - all_fakegem_install - - # systemd stuffs - systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" - - # tmpfiles stuff - newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf" - - # openrc init stuff - newinitd "${FILESDIR}"/puppet.init puppet - - keepdir /etc/puppetlabs/puppet/ssl - - keepdir /var/lib/puppet/facts - keepdir /var/lib/puppet/files - fowners -R puppet:puppet /var/lib/puppet - - fperms 0750 /var/lib/puppet - - fperms 0750 /etc/puppetlabs - fperms 0750 /etc/puppetlabs/puppet - fperms 0750 /etc/puppetlabs/puppet/ssl - fowners -R :puppet /etc/puppetlabs - fowners -R :puppet /var/lib/puppet - - # ext and examples files - for f in $(find ext examples -type f) ; do - docinto "$(dirname ${f})" - dodoc "${f}" - done -} - -pkg_postinst() { - tmpfiles_process puppet.conf - - elog - elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" - elog "cause puppet to hang while installing packages." - elog - elog "Portage Puppet module with Gentoo-specific resources:" - elog "http://forge.puppetlabs.com/gentoo/portage" - elog - elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)" - elog "suppert was removed for >=6.x, please migrate to puppetserver if you have" - elog "not already done so." - elog -} diff --git a/app-admin/puppet/puppet-7.28.0-r1.ebuild b/app-admin/puppet/puppet-7.28.0-r1.ebuild index 2331b40f31d2..5ac1ad9152b9 100644 --- a/app-admin/puppet/puppet-7.28.0-r1.ebuild +++ b/app-admin/puppet/puppet-7.28.0-r1.ebuild @@ -11,8 +11,8 @@ RUBY_FAKEGEM_EXTRAINSTALL="locales" inherit ruby-fakegem systemd tmpfiles DESCRIPTION="A system automation and configuration management software" -HOMEPAGE="https://puppet.com/" -SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" +HOMEPAGE="https://www.puppet.com/" +SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" LICENSE="Apache-2.0 GPL-2" SLOT="0" diff --git a/app-admin/puppet/puppet-8.3.1-r1.ebuild b/app-admin/puppet/puppet-8.3.1-r1.ebuild deleted file mode 100644 index da3eb9487a0c..000000000000 --- a/app-admin/puppet/puppet-8.3.1-r1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -USE_RUBY="ruby31" -RUBY_FAKEGEM_RECIPE_TEST="rspec3" -RUBY_FAKEGEM_TASK_DOC="doc:all" -RUBY_FAKEGEM_EXTRAINSTALL="locales" - -inherit ruby-fakegem systemd tmpfiles - -DESCRIPTION="A system automation and configuration management software" -HOMEPAGE="https://puppet.com/" -SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" -IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax" -RESTRICT="test" - -ruby_add_rdepend " - hiera? ( dev-ruby/hiera ) - dev-ruby/json:= - dev-ruby/semantic_puppet - >=dev-ruby/facter-3.0.0 - dev-ruby/deep_merge - dev-ruby/concurrent-ruby - augeas? ( dev-ruby/ruby-augeas ) - diff? ( dev-ruby/diff-lcs ) - doc? ( dev-ruby/rdoc ) - ldap? ( dev-ruby/ruby-ldap ) - shadow? ( dev-ruby/ruby-shadow ) - sqlite? ( dev-ruby/sqlite3 ) - virtual/ruby-ssl - dev-ruby/hocon" - -ruby_add_bdepend " - doc? ( dev-ruby/yard ) - test? ( - dev-ruby/mocha - dev-ruby/rack - dev-ruby/rspec-its - )" -# this should go in the above lists, but isn't because of test deps not being keyworded -# dev-ruby/rspec-collection_matchers - -RDEPEND+=" ${RDEPEND} - rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) - >=app-portage/eix-0.18.0 - acct-user/puppet - acct-group/puppet" -PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" - -all_ruby_prepare() { - # Avoid spec that require unpackaged json-schema. - rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die - - # fix systemd path - eapply -p0 "${FILESDIR}/puppet-systemd.patch" - - # Avoid specs that can only run in the puppet.git repository. This - # should be narrowed down to the specific specs. - rm spec/integration/parser/compiler_spec.rb || die - - # Avoid failing spec that need further investigation. - rm spec/unit/module_tool/metadata_spec.rb || die -} - -each_ruby_install() { - each_fakegem_install -# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \ -# "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" -} - -all_ruby_install() { - all_fakegem_install - - # systemd stuffs - systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" - - # tmpfiles stuff - newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf" - - # openrc init stuff - newinitd "${FILESDIR}"/puppet.init puppet - - keepdir /etc/puppetlabs/puppet/ssl - - keepdir /var/lib/puppet/facts - keepdir /var/lib/puppet/files - fowners -R puppet:puppet /var/lib/puppet - - fperms 0750 /var/lib/puppet - - fperms 0750 /etc/puppetlabs - fperms 0750 /etc/puppetlabs/puppet - fperms 0750 /etc/puppetlabs/puppet/ssl - fowners -R :puppet /etc/puppetlabs - fowners -R :puppet /var/lib/puppet - - # ext and examples files - for f in $(find ext examples -type f) ; do - docinto "$(dirname ${f})" - dodoc "${f}" - done -} - -pkg_postinst() { - tmpfiles_process puppet.conf - - elog - elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" - elog "cause puppet to hang while installing packages." - elog - elog "Portage Puppet module with Gentoo-specific resources:" - elog "http://forge.puppetlabs.com/gentoo/portage" - elog -} diff --git a/app-admin/puppet/puppet-8.5.0.ebuild b/app-admin/puppet/puppet-8.5.1-r1.ebuild index 7626f615fbf8..0666e52b19ae 100644 --- a/app-admin/puppet/puppet-8.5.0.ebuild +++ b/app-admin/puppet/puppet-8.5.1-r1.ebuild @@ -11,12 +11,12 @@ RUBY_FAKEGEM_EXTRAINSTALL="locales" inherit ruby-fakegem systemd tmpfiles DESCRIPTION="A system automation and configuration management software" -HOMEPAGE="https://puppet.com/" -SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" +HOMEPAGE="https://www.puppet.com/" +SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax" RESTRICT="test" @@ -24,7 +24,7 @@ ruby_add_rdepend " hiera? ( dev-ruby/hiera ) dev-ruby/json:= dev-ruby/semantic_puppet - >=dev-ruby/facter-3.0.0 + >=dev-ruby/facter-4.4.1 dev-ruby/deep_merge dev-ruby/concurrent-ruby augeas? ( dev-ruby/ruby-augeas ) diff --git a/app-admin/puppet/puppet-8.4.0-r1.ebuild b/app-admin/puppet/puppet-8.6.0-r1.ebuild index da3eb9487a0c..0666e52b19ae 100644 --- a/app-admin/puppet/puppet-8.4.0-r1.ebuild +++ b/app-admin/puppet/puppet-8.6.0-r1.ebuild @@ -11,8 +11,8 @@ RUBY_FAKEGEM_EXTRAINSTALL="locales" inherit ruby-fakegem systemd tmpfiles DESCRIPTION="A system automation and configuration management software" -HOMEPAGE="https://puppet.com/" -SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" +HOMEPAGE="https://www.puppet.com/" +SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" LICENSE="Apache-2.0 GPL-2" SLOT="0" @@ -24,7 +24,7 @@ ruby_add_rdepend " hiera? ( dev-ruby/hiera ) dev-ruby/json:= dev-ruby/semantic_puppet - >=dev-ruby/facter-3.0.0 + >=dev-ruby/facter-4.4.1 dev-ruby/deep_merge dev-ruby/concurrent-ruby augeas? ( dev-ruby/ruby-augeas ) @@ -59,18 +59,8 @@ RDEPEND+=" ${RDEPEND} PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" all_ruby_prepare() { - # Avoid spec that require unpackaged json-schema. - rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die - # fix systemd path eapply -p0 "${FILESDIR}/puppet-systemd.patch" - - # Avoid specs that can only run in the puppet.git repository. This - # should be narrowed down to the specific specs. - rm spec/integration/parser/compiler_spec.rb || die - - # Avoid failing spec that need further investigation. - rm spec/unit/module_tool/metadata_spec.rb || die } each_ruby_install() { diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest index 56a7d880dbfb..c838683e43c3 100644 --- a/app-admin/puppetdb/Manifest +++ b/app-admin/puppetdb/Manifest @@ -1,3 +1,2 @@ DIST puppetdb-7.13.0.tar.gz 49917440 BLAKE2B 7cb01b2dbd6b6b22aad11a7fbcabff1c8452d51437bd0b3db3c8afe9d72bb853b66a9c8056c4c7c33f284efc4a90c788a05411fe6f80ae081ef817bb7f609bf3 SHA512 ba94031b3c15d38a2719390145e034be453a5f8368b5c53420bf3b371cc36a49f0b416447ec4d9de41ef0618b32ec806b9bae996ec3c4ca0ce05fb152940c2f2 -DIST puppetdb-8.2.0.tar.gz 59250096 BLAKE2B ed1009e87cad366a1d3399eb55b51d8aaad325f1b2da9c2fc5f77a1ad43581009ebc23f5e6756cd86430eb300d389a9022b14c29bdd4ea392cf956627df0f1fe SHA512 59d894710c2591566f9900a7fc1a396f971152e66ae423b54d73b0b9d474eaf4f58926fb6dc4815865dac8bd2dc458161685876ffdc9db5a3d049d0ffeb9b601 -DIST puppetdb-8.4.1.tar.gz 60378645 BLAKE2B eb107fd2016335f814ce9de5431abb2573fd71e8b1a37faf3dad0079ca464f15785bde79eaa49f343a8dd146b9977dbb9ce4e23bce61ba39e5526e422995a497 SHA512 89f405e5364eff1ecf1482ff620de1a7fbb818b3a7ab2463f6ff47fcba0552ac440639c72f2875de956127ea3da9a5d59aa3bb220e59d0994ed3683cac22309c +DIST puppetdb-8.5.0.tar.gz 60440356 BLAKE2B 8c3116b040c91a1b406e56b419ddd7e31a5ecc7aae97c73b03fcecebeedefb1b8eed44ce54b07881cbbb025b79bfa076618c6fd6df861a6dcf03c047e7c8f480 SHA512 92808758271c43eabbd508fcb321b3e52a92d0aa860f2c9b42d1df6dcffedb41110c8cc2e72c599fa1762404112f1fc76699f449858a627dd1ca5caa84a2d381 diff --git a/app-admin/puppetdb/puppetdb-8.2.0.ebuild b/app-admin/puppetdb/puppetdb-8.2.0.ebuild deleted file mode 100644 index 44b569aab29c..000000000000 --- a/app-admin/puppetdb/puppetdb-8.2.0.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd tmpfiles - -DESCRIPTION="PuppetDB collects data generated by Puppet" -HOMEPAGE="http://docs.puppetlabs.com/puppetdb/" -SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" -KEYWORDS="amd64 x86" - -RDEPEND+=">=virtual/jdk-11" -DEPEND+="acct-user/puppetdb - acct-group/puppetdb" - -src_prepare() { - sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die - sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die - sed -i 's/sysconfig/conf\.d/g' install.sh || die - sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die - sed -i 's/var\/run/run/g' install.sh || die - default -} - -src_compile() { - einfo "not compiling" -} - -src_install() { - dodir /opt/puppetlabs/server/data/puppetdb - insinto /opt/puppetlabs/server/apps/puppetdb - insopts -m0744 - doins ext/ezbake-functions.sh - insopts -m0644 - doins ext/ezbake.manifest - doins puppetdb.jar - insinto /etc/puppetlabs/puppetdb - doins ext/config/logback.xml - doins ext/config/bootstrap.cfg - doins ext/config/request-logging.xml - insinto /etc/puppetlabs/puppetdb/conf.d - doins ext/config/conf.d/jetty.ini - doins ext/config/conf.d/repl.ini - doins ext/config/conf.d/database.ini - doins ext/config/conf.d/config.ini - doins ext/config/conf.d/auth.conf - insopts -m0755 - insinto /opt/puppetlabs/server/apps/puppetdb/scripts - doins install.sh - insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps - doins ext/cli/foreground - doins ext/cli/ssl-setup - doins ext/cli/config-migration - doins ext/cli/foreground - doins ext/cli/anonymize - doins ext/cli/reload - doins ext/cli/start - doins ext/cli/stop - insinto /opt/puppetlabs/server/apps/puppetdb/bin - doins ext/bin/puppetdb - insopts -m0644 - dodir /opt/puppetlabs/server/bin - dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb - dodir /opt/puppetlabs/bin - dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb - dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb - # init type tasks - newconfd ext/default puppetdb - systemd_dounit ext/redhat/puppetdb.service - newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf - newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb - # misc - insinto /etc/logrotate.d - newins ext/puppetdb.logrotate.conf puppetdb - fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb - fperms -R 770 /opt/puppetlabs/server/data/puppetdb -} - -pkg_postinst() { - tmpfiles_process puppetdb.conf - - elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'" - elog - elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'" -} diff --git a/app-admin/puppetdb/puppetdb-8.4.1.ebuild b/app-admin/puppetdb/puppetdb-8.5.0.ebuild index d08261a3e451..4b5a495abffd 100644 --- a/app-admin/puppetdb/puppetdb-8.4.1.ebuild +++ b/app-admin/puppetdb/puppetdb-8.5.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" IUSE="" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND+=">=virtual/jdk-11" DEPEND+="acct-user/puppetdb diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest index c6646756a2f1..555c21456061 100644 --- a/app-admin/puppetserver/Manifest +++ b/app-admin/puppetserver/Manifest @@ -1,3 +1,2 @@ DIST puppetserver-7.11.0.tar.gz 59927771 BLAKE2B dcf2543ac6d5427f57bb451ff9cc6db6748522ffed6fd5a7e81bd63be899fbf722016975fdfca5154489bcaf93d973d11669dd455ad44c79b3be50ccc5e0f636 SHA512 4c9c8d05048ccc35fd729a9a37151451e97655eed131f7192be2dac7614c309ffa4cdb0dd77f1c9eb2666d7df630690faa52ad2b01266010533522b58fb06f79 -DIST puppetserver-8.3.0.tar.gz 63318772 BLAKE2B 863337c364573b340b802b83f0593fdc510424bfbcf6c6b9f8a8e56729a4db689ce5d4c0d9e1a91399e123e05f42ed0547e6a2e86905d0166c189c79966cd9f3 SHA512 c9aa0f84f989dc544ee5d8d268f753b0961f6766531d832a2c99012701dd219d1c2abf4371835242b3445428a7518e86718552678b559b3bf9b027cbf72977fb -DIST puppetserver-8.5.0.tar.gz 64463953 BLAKE2B 305f75165f919299301209c5a502237bf931342a9d0bf77d91f81f7801760faa421f1767eff283ac82e2cc49792b94126354b177e7b68bda9be61430d123621f SHA512 cb826e2450aa36380a93e95ee8055e6187944d2eecc6d5c339d4b183662d4a56d1e14847fd17b2bc50316f029dbe36791441947832686c9bfb6b0176edf7b22e +DIST puppetserver-8.6.0.tar.gz 64667765 BLAKE2B bb367a2ed980a6335a6d1e2bc09ad10ccdcc636eee6b658cab5d4bc530f656c76d75545d17e11d7b58288867edcb39bd54af0ddfd5bde2f13cb5000ed33d0bd0 SHA512 e780c78371865e754a3a7fc5343b11f9a0319caf34dcf6ca998295243d1fa2137a617867782878d9bb735c96d5dd1f3e3174898eef240353d3af63eb87cdc4a2 diff --git a/app-admin/puppetserver/puppetserver-8.3.0.ebuild b/app-admin/puppetserver/puppetserver-8.3.0.ebuild deleted file mode 100644 index 34a4a96140ca..000000000000 --- a/app-admin/puppetserver/puppetserver-8.3.0.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd tmpfiles - -DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents" -HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" -SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="puppetdb" -# will need the same keywords in puppet-agent (puppet-agent now has arm64) -KEYWORDS="amd64" - -RDEPEND+=" - >=virtual/jdk-11 - app-admin/puppet-agent[puppetdb?]" -DEPEND+="acct-user/puppet - acct-group/puppet" - -src_prepare() { - sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die - sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die - sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die - sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die - sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die - sed -i 's/var\/run/run/g' install.sh || die - default -} - -src_compile() { - einfo "not compiling" -} - -src_install() { - insinto /opt/puppetlabs/server/apps/puppetserver - insopts -m0774 - doins ext/ezbake-functions.sh - insopts -m0644 - doins ext/ezbake.manifest - doins puppet-server-release.jar - insinto /etc/puppetlabs/puppetserver - doins ext/config/logback.xml - doins ext/config/request-logging.xml - insinto /etc/puppetlabs/puppetserver/services.d - doins ext/system-config/services.d/bootstrap.cfg - doins ext/config/services.d/ca.cfg - insinto /etc/puppetlabs/puppetserver/conf.d - doins ext/config/conf.d/puppetserver.conf - doins ext/config/conf.d/auth.conf - doins ext/config/conf.d/global.conf - doins ext/config/conf.d/web-routes.conf - doins ext/config/conf.d/metrics.conf - doins ext/config/conf.d/webserver.conf - insopts -m0755 - insinto /opt/puppetlabs/server/apps/puppetserver/scripts - doins install.sh - insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps - doins ext/cli/ca - doins ext/cli/irb - doins ext/cli/foreground - doins ext/cli/gem - doins ext/cli/ruby - doins ext/cli/reload - doins ext/cli/start - doins ext/cli/stop - insinto /opt/puppetlabs/server/apps/puppetserver/cli - doins ext/cli_defaults/cli-defaults.sh - insinto /opt/puppetlabs/server/apps/puppetserver/bin - doins ext/bin/puppetserver - insopts -m0644 - dodir /opt/puppetlabs/server/bin - dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver - dodir /opt/puppetlabs/bin - dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver - dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver - dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d - # other sys stuff - dodir /etc/puppetlabs/code - # needed for systemd - keepdir /var/log/puppetlabs/puppetserver - dodir /etc/puppetlabs/puppet/ssl - fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl - fperms -R 771 /etc/puppetlabs/puppet/ssl - # systemd type things - insinto /etc/systemd/system/puppetserver.service.d/ - systemd_dounit ext/redhat/puppetserver.service - insinto /etc/default - newins ext/default puppetserver - # normal init type tasks - dosym ../default/puppetserver /etc/conf.d/puppetserver - newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver - # misc - insinto /etc/logrotate.d - newins ext/puppetserver.logrotate.conf puppetserver - # cleanup - dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems - fowners -R puppet:puppet /opt/puppetlabs/server/data - fperms -R 775 /opt/puppetlabs/server/data/puppetserver - fperms -R 700 /var/log/puppetlabs/puppetserver - insinto /opt/puppetlabs/server/data - doins ext/build-scripts/jruby-gem-list.txt - doins ext/build-scripts/mri-gem-list-no-dependencies.txt - newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf -} - -pkg_postinst() { - tmpfiles_process puppetserver.conf - - elog "to install you may want to run the following:" - elog - elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" - elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" - elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" - elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" - elog "puppet config set --section master codedir /etc/puppetlabs/code" - elog - elog "# install puppetserver gems" - elog "cd /opt/puppetlabs/server/apps/puppetserver" - elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf" - elog "while read LINE; do" - elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" - elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" - elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" - elog "while read LINE; do" - elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" - elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt" -} diff --git a/app-admin/puppetserver/puppetserver-8.5.0.ebuild b/app-admin/puppetserver/puppetserver-8.6.0.ebuild index b19d42ecbb7c..198d1e787156 100644 --- a/app-admin/puppetserver/puppetserver-8.5.0.ebuild +++ b/app-admin/puppetserver/puppetserver-8.6.0.ebuild @@ -13,7 +13,7 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="puppetdb" # will need the same keywords in puppet-agent (puppet-agent now has arm64) -KEYWORDS="~amd64" +KEYWORDS="amd64" RDEPEND+=" >=virtual/jdk-11 diff --git a/app-admin/pwgen/pwgen-2.08-r1.ebuild b/app-admin/pwgen/pwgen-2.08-r1.ebuild index 5b502f541a14..eeae71e79862 100644 --- a/app-admin/pwgen/pwgen-2.08-r1.ebuild +++ b/app-admin/pwgen/pwgen-2.08-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Password Generator" HOMEPAGE="https://sourceforge.net/projects/pwgen/" -SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/pwgen/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/app-admin/pwgen/pwgen-2.08-r2.ebuild b/app-admin/pwgen/pwgen-2.08-r2.ebuild index 8ad678195b59..65522c61d298 100644 --- a/app-admin/pwgen/pwgen-2.08-r2.ebuild +++ b/app-admin/pwgen/pwgen-2.08-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Password Generator" HOMEPAGE="https://sourceforge.net/projects/pwgen/" -SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/pwgen/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/app-admin/pwman3/Manifest b/app-admin/pwman3/Manifest index 29a35022f5d4..0f77c15a2e52 100644 --- a/app-admin/pwman3/Manifest +++ b/app-admin/pwman3/Manifest @@ -1,2 +1 @@ -DIST pwman3-0.11.1.tar.gz 76992 BLAKE2B cd7289781436f0f8b941d587c61b2d8a5cad52f3d57d01106d73b3da5930de2bd2df15fe5a4bcfbdce5e5733b7328764d6e4e2d18cba8a575cadad8835218e75 SHA512 111713e23b64a7492b5e2735b0d0117a81759bd9f25a87327a2aa4a465fbbc8a0aa0fbfa86b84cbcd40eb1540d05cdbc6fb81982fe61953df91979e674ce5640 DIST pwman3-0.12.2.tar.gz 76744 BLAKE2B 5223169a267f0c35bcb26499138c9b768c6e29c4ce39d4fb89c56eb72d24a9729159bed93af24e12f1e0e6c1569586772eb36954afd51afc7c97c9de898346e5 SHA512 587839e7d532ef3c53e2c429b086eb6bd59290ce43687034400f8e0772cc4e97c9296694ad83c5fa3fdde37b8d8fef5bc150e9f81fcb9fe8712ffafb4be8b400 diff --git a/app-admin/pwman3/pwman3-0.11.1.ebuild b/app-admin/pwman3/pwman3-0.11.1.ebuild deleted file mode 100644 index af696aad1fb2..000000000000 --- a/app-admin/pwman3/pwman3-0.11.1.ebuild +++ /dev/null @@ -1,31 +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 distutils-r1 optfeature - -DESCRIPTION="A lightweight password-manager with multiple database backends" -HOMEPAGE="https://pwman3.github.io/pwman3/" -SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/cryptography-2.3[${PYTHON_USEDEP}] - >=dev-python/colorama-0.3.0[${PYTHON_USEDEP}] -" -BDEPEND="test? ( dev-python/pexpect[${PYTHON_USEDEP}] )" - -distutils_enable_tests setup.py - -pkg_postinst() { - optfeature "Support for mongodb" dev-python/pymongo - optfeature "Support for postgresql" dev-python/psycopg:2 - optfeature "Support for mysql" dev-python/pymysql -} diff --git a/app-admin/pwman3/pwman3-0.12.2.ebuild b/app-admin/pwman3/pwman3-0.12.2.ebuild index 5fb9d641fba2..671c2afbb0dc 100644 --- a/app-admin/pwman3/pwman3-0.12.2.ebuild +++ b/app-admin/pwman3/pwman3-0.12.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="sqlite" DISTUTILS_USE_PEP517=setuptools @@ -16,15 +16,22 @@ SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64" +IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" >=dev-python/cryptography-2.3[${PYTHON_USEDEP}] >=dev-python/colorama-0.4.0[${PYTHON_USEDEP}] " -BDEPEND="test? ( dev-python/pexpect[${PYTHON_USEDEP}] )" +BDEPEND=" + test? ( + dev-python/pexpect[${PYTHON_USEDEP}] + ) +" -distutils_enable_tests setup.py +python_test() { + "${EPYTHON}" -m tests.test_pwman || die "Tests fail with ${EPYTHON}" +} pkg_postinst() { optfeature "Support for mongodb" dev-python/pymongo diff --git a/app-admin/pydf/metadata.xml b/app-admin/pydf/metadata.xml index 4c0d3032d69c..115e9d64a669 100644 --- a/app-admin/pydf/metadata.xml +++ b/app-admin/pydf/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-admin/qtpass/Manifest b/app-admin/qtpass/Manifest index 78f1fc36a962..93c1df56388f 100644 --- a/app-admin/qtpass/Manifest +++ b/app-admin/qtpass/Manifest @@ -1,2 +1 @@ -DIST qtpass-1.3.2.tar.gz 310316 BLAKE2B ac0f562fd263e9d46980a69183cfd556596750e1050dbc50748cd9be45bc4bf39e4de14cb59f778cfc54f5c32050d567d88d65ec039cba1e9c2e8ef24d7ae99a SHA512 9026f74f6ff75fcef2f6a0862484a2a1eaed1370edd0659e8b4d20039affe846e0da3a0a26a804563813bc678638ab67fa516441208e70c7e9de9b2eda876a10 DIST qtpass-1.4.0.tar.gz 581368 BLAKE2B 12bf414ea781bad34d97fe28ae39f44e17812039f0d798162b6d875918f20a1583f7a53a1e98ed917edf41c15709c7693c7651205c5e4ec85860ee773350f075 SHA512 47c1284c10e0d8a3bf63c049fc29d785d1a53bef6f183bbe22efebf466371dd454a6e43c944739f487d609f3cde188701ba538e9cb8e2c7e5530f8fa6f992625 diff --git a/app-admin/qtpass/qtpass-1.3.2-r2.ebuild b/app-admin/qtpass/qtpass-1.3.2-r2.ebuild deleted file mode 100644 index 6c2724ff6e11..000000000000 --- a/app-admin/qtpass/qtpass-1.3.2-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop qmake-utils virtualx - -DESCRIPTION="Multi-platform GUI for pass, the standard unix password manager" -HOMEPAGE="https://qtpass.org https://github.com/IJHack/qtpass" -SRC_URI="https://github.com/IJHack/qtpass/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="test" - -RDEPEND="|| ( app-admin/pass app-admin/gopass ) - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - net-misc/x11-ssh-askpass" -DEPEND="${RDEPEND} - dev-qt/qtsvg:5 - test? ( dev-qt/qttest:5 )" -BDEPEND="dev-qt/linguist-tools:5" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/QtPass-${PV}" - -DOCS=( {CHANGELOG,CONTRIBUTING,FAQ,README}.md ) - -src_prepare() { - default - - if ! use test ; then - sed -i '/SUBDIRS += src /s/tests //' \ - qtpass.pro || die "sed for qtpass.pro failed" - fi -} - -src_configure() { - eqmake5 PREFIX="${EPREFIX}"/usr -} - -src_test() { - virtx default -} - -src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs - - insinto /usr/share/qtpass/translations - doins localization/*.qm - - doman qtpass.1 - domenu qtpass.desktop - newicon artwork/icon.png qtpass-icon.png - insinto /usr/share/metainfo - doins qtpass.appdata.xml -} diff --git a/app-admin/quickswitch/quickswitch-1.05.ebuild b/app-admin/quickswitch/quickswitch-1.05.ebuild index 1a70041c58f2..81fca7052e53 100644 --- a/app-admin/quickswitch/quickswitch-1.05.ebuild +++ b/app-admin/quickswitch/quickswitch-1.05.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Utility to switch network profiles on the fly" HOMEPAGE="https://muthanna.com/quickswitch/index.html" -SRC_URI="mirror://sourceforge/quickswitch/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/quickswitch/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest index 05b315f32068..fb51dda3ab9c 100644 --- a/app-admin/r10k/Manifest +++ b/app-admin/r10k/Manifest @@ -1,3 +1,3 @@ -DIST r10k-3.16.0.tar.gz 253547 BLAKE2B 683fdd5588c7b3c3b47ae0d28d75fbfb929d5595c715531eed86b8d89f76708c91f38f9ca558040b36fac38c038211086a74fdf109b37350126bc78b25f8b751 SHA512 399a357cf8617427632516e0f439a40464ba0c8201ee7b6ce15c893ae029bfd9ae1438b76aff3b9601685d14febf8fc71dbdd2954eb3352d6ce713e769cb586d -DIST r10k-4.0.0.tar.gz 254074 BLAKE2B 8053d435691d33cd1d8b3c55c2cb3a153cd952112a93f2eeb4b715c6c0b92e9192c65f8809b4187d5ff4f5f6b9ed8f67a644d7920bf8d8294dd0b5d8fd735836 SHA512 a6b92fabcc405fe6678da724743e43d9dc3a286e3a973a3320ac94c25dd385315baaaf495dbd1706005d31f13d4c52f1c425148d3b397448fed07fd83acb04fa DIST r10k-4.0.1.tar.gz 254147 BLAKE2B 83c71c39f50aaf390ef75b8d87a693ba8d131297fcb12c3e408665565e35119d3e9e2832b8172b0616145459368dd5af38bcecca666ac1020ba96a59abc83657 SHA512 74583a79637d8c60f3935cd7ea382fff189beb7d6825b10b9c6bfc0a625a62f81648795cefc878cec608d96ba2396749f7fc0a1c7bdfa9bfcf914848135a0675 +DIST r10k-4.0.2.tar.gz 254228 BLAKE2B b98a665200978a023dc2566bc4b3c141eed6c950d27dc0401c8c7e8d1096f5fa0562874bd1a0e1726dd687a046cf345c0ce5003d5a2a7f72bf397d91b07065c3 SHA512 5f4d9b5fdcd45ffe5b9c2ef95fff7b7ae3136adefcee754782815bb523d0281ec3ee50615600b2fe80ee9d98b75d80747072c425c4d15c795cd7dcb27d1f192b +DIST r10k-4.1.0.tar.gz 254276 BLAKE2B ba154d8500beef70cb6a8761833b05e0b5a3122b6a4a04dafc7c20ccce76e6fd30dbe0ac0bae667fac7d985ddc2921f43657c0bf2cd0c6d877370b7d2e73e799 SHA512 c8c78b013fa75a29b205ae9a6ee24f1369b4ffec2d3d7d9e9b3b5482ffa77c19f360dc8fd8444388dd527cbb31fd9c2aa96201d5f60d53f0b23a55d446d43a8c diff --git a/app-admin/r10k/r10k-4.0.0.ebuild b/app-admin/r10k/r10k-4.0.2.ebuild index fa99e710fd2f..28655c6c3ecb 100644 --- a/app-admin/r10k/r10k-4.0.0.ebuild +++ b/app-admin/r10k/r10k-4.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,7 +25,7 @@ IUSE="+git" ruby_add_rdepend " ~dev-ruby/colored2-3.1.2 >=dev-ruby/cri-2.15.10:0 - || ( dev-ruby/gettext-setup:1 >=dev-ruby/gettext-setup-0.24:0 ) + dev-ruby/gettext-setup:1 >=dev-ruby/jwt-2.2.3:2 <dev-ruby/jwt-2.8.0:2 >=dev-ruby/ruby-gettext-3.0.2:0 ~dev-ruby/log4r-1.1.10 @@ -34,10 +34,6 @@ ruby_add_rdepend " dev-ruby/puppet_forge:5 " -ruby_add_bdepend "test? ( - >=dev-ruby/minitar-0.9 -)" - RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )" all_ruby_prepare() { diff --git a/app-admin/r10k/r10k-3.16.0.ebuild b/app-admin/r10k/r10k-4.1.0.ebuild index a3baf5d7fa01..97a2b986e36f 100644 --- a/app-admin/r10k/r10k-3.16.0.ebuild +++ b/app-admin/r10k/r10k-4.1.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby31" +USE_RUBY="ruby31 ruby32 ruby33" RUBY_FAKEGEM_RECIPE_DOC="none" RUBY_FAKEGEM_RECIPE_TEST="rspec3" @@ -25,24 +25,21 @@ IUSE="+git" ruby_add_rdepend " ~dev-ruby/colored2-3.1.2 >=dev-ruby/cri-2.15.10:0 - || ( dev-ruby/gettext-setup:1 >=dev-ruby/gettext-setup-0.24:0 ) - || ( dev-ruby/fast_gettext:2 >=dev-ruby/fast_gettext-1.1:0 ) - >=dev-ruby/jwt-2.2.3:2 <dev-ruby/jwt-2.8.0:2 + dev-ruby/gettext-setup:1 + >=dev-ruby/jwt-2.2.3:2 >=dev-ruby/ruby-gettext-3.0.2:0 ~dev-ruby/log4r-1.1.10 >=dev-ruby/minitar-0.9:0 - >=dev-ruby/multi_json-1.10:0 - =dev-ruby/puppet_forge-3* + dev-ruby/puppet_forge:5 " -ruby_add_bdepend "test? ( - >=dev-ruby/minitar-0.9 -)" - RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )" all_ruby_prepare() { + # Remove unused multi_json dependency. It is not used anywhere and + # the code for which is was introduced originally is gone. sed -e '/s.files/d' \ + -e '/multi_json/ s:^:#:' \ -i ${RUBY_FAKEGEM_GEMSPEC} || die # Avoid specs for unpackaged rugget git provider diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest index 4ce4630f3ac4..9a9fb8255bc2 100644 --- a/app-admin/rasdaemon/Manifest +++ b/app-admin/rasdaemon/Manifest @@ -1,3 +1 @@ -DIST rasdaemon-0.6.8.tar.gz 161343 BLAKE2B 95dab212e404480d45e5b07fa0f9ec7361036c9295a81dd082657c71cf8ad1114cc28f163b8975733e2042dfeb957f8da71dc52440249c75c24653c1ce235e86 SHA512 634638154c6b0bf7a079d6aba884a55e540c9edc3c25715a792ad7535c68629618e9cef8b6ec7e20845f78bd57f712d437be4d772523020f09d30cce42759a30 -DIST rasdaemon-0.7.0.tar.bz2 433555 BLAKE2B cf73f59558d8a6f3138fea20e7096a1b1214dd44a4518da88a4b1f0c4c92a6df4eb7922e9a2e76d5012364219067cf66e220d8f54588ab22acf09937e41aa2dc SHA512 a7938ccd8171d849b5d89df6ab90942278c824a3dbd17abda8ae3d80ce5227cbc3fe23b31806609114482606d780ec7f0676a0fedfa950ed8cb5a59f3583bd57 DIST rasdaemon-0.8.0.tar.bz2 394983 BLAKE2B 24209f468fea2bc4e85dcac51e363e44a8a44b224b448ec1330bcd15a5b2b4b3cceeec78dbc86b4a88f5a378ecacba62cdba8e9c3e2b1b3a70be85a18af166ab SHA512 f6262f098fd2a08d35fef2c25e2452a202151d4cc93a1829e821abd564acf7dcf80b08f819cbd7f04244dcc9f1dec5d9138aa013bb43c8fcf19d340233275614 diff --git a/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch b/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch deleted file mode 100644 index 6a3beaae217c..000000000000 --- a/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch +++ /dev/null @@ -1,186 +0,0 @@ -https://github.com/mchehab/rasdaemon/pull/81 - -From 9632f63c3855b119ab4b02300e27ab357bddcf03 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Thu, 29 Dec 2022 17:23:47 +0000 -Subject: [PATCH] configure.ac: fix bashisms -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -configure scripts need to be runnable with a POSIX-compliant /bin/sh. - -On many (but not all!) systems, /bin/sh is provided by Bash, so errors -like this aren't spotted. Notably Debian defaults to /bin/sh provided -by dash which doesn't tolerate such bashisms as '=='. - -This retains compatibility with bash. - -Signed-off-by: Sam James <sam@gentoo.org> ---- a/configure.ac -+++ b/configure.ac -@@ -27,14 +27,14 @@ AC_ARG_ENABLE([all], - AC_ARG_ENABLE([sqlite3], - AS_HELP_STRING([--enable-sqlite3], [enable storing data at SQL lite database (currently experimental)])) - --AS_IF([test "x$enable_sqlite3" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_sqlite3" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_CHECK_LIB(sqlite3, sqlite3_open,[echo "found sqlite3"] , AC_MSG_ERROR([*** Unable to find sqlite3 library]), ) - SQLITE3_LIBS="-lsqlite3" - AC_DEFINE(HAVE_SQLITE3,1,"have sqlite3") - AC_SUBST([WITH_SQLITE3]) - ]) - --AM_CONDITIONAL([WITH_SQLITE3], [test x$enable_sqlite3 = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_SQLITE3], [test x$enable_sqlite3 = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_SQLITE3], [USE_SQLITE3="yes"], [USE_SQLITE3="no"]) - - AC_SUBST([SQLITE3_LIBS]) -@@ -43,122 +43,122 @@ AC_SUBST([SQLITE3_LIBS]) - AC_ARG_ENABLE([aer], - AS_HELP_STRING([--enable-aer], [enable PCIe AER events (currently experimental)])) - --AS_IF([test "x$enable_aer" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_aer" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_AER,1,"have PCIe AER events collect") - AC_SUBST([WITH_AER]) - ]) --AM_CONDITIONAL([WITH_AER], [test x$enable_aer = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_AER], [test x$enable_aer = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_AER], [USE_AER="yes"], [USE_AER="no"]) - - - AC_ARG_ENABLE([non_standard], - AS_HELP_STRING([--enable-non-standard], [enable NON_STANDARD events (currently experimental)])) - --AS_IF([test "x$enable_non_standard" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_non_standard" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_NON_STANDARD,1,"have UNKNOWN_SEC events collect") - AC_SUBST([WITH_NON_STANDARD]) - ]) --AM_CONDITIONAL([WITH_NON_STANDARD], [test x$enable_non_standard = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_NON_STANDARD], [test x$enable_non_standard = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_NON_STANDARD], [USE_NON_STANDARD="yes"], [USE_NON_STANDARD="no"]) - - AC_ARG_ENABLE([arm], - AS_HELP_STRING([--enable-arm], [enable ARM events (currently experimental)])) - --AS_IF([test "x$enable_arm" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_arm" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_ARM,1,"have ARM events collect") - AC_SUBST([WITH_ARM]) - ]) --AM_CONDITIONAL([WITH_ARM], [test x$enable_arm = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_ARM], [test x$enable_arm = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_ARM], [USE_ARM="yes"], [USE_ARM="no"]) - - AC_ARG_ENABLE([mce], - AS_HELP_STRING([--enable-mce], [enable MCE events (currently experimental)])) - --AS_IF([test "x$enable_mce" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_mce" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_MCE,1,"have PCIe MCE events collect") - AC_SUBST([WITH_MCE]) - ]) --AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_MCE], [USE_MCE="yes"], [USE_MCE="no"]) - - AC_ARG_ENABLE([extlog], - AS_HELP_STRING([--enable-extlog], [enable EXTLOG events (currently experimental)])) - --AS_IF([test "x$enable_extlog" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_extlog" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_EXTLOG,1,"have EXTLOG events collect") - AC_SUBST([WITH_EXTLOG]) - ]) --AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_EXTLOG], [USE_EXTLOG="yes"], [USE_EXTLOG="no"]) - - AC_ARG_ENABLE([devlink], - AS_HELP_STRING([--enable-devlink], [enable devlink health events (currently experimental)])) - --AS_IF([test "x$enable_devlink" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_devlink" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_DEVLINK,1,"have devlink health events collect") - AC_SUBST([WITH_DEVLINK]) - ]) --AM_CONDITIONAL([WITH_DEVLINK], [test x$enable_devlink = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_DEVLINK], [test x$enable_devlink = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_DEVLINK], [USE_DEVLINK="yes"], [USE_DEVLINK="no"]) - - AC_ARG_ENABLE([diskerror], - AS_HELP_STRING([--enable-diskerror], [enable disk I/O error events (currently experimental)])) - --AS_IF([test "x$enable_diskerror" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_diskerror" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_DISKERROR,1,"have disk I/O errors collect") - AC_SUBST([WITH_DISKERROR]) - ]) --AM_CONDITIONAL([WITH_DISKERROR], [test x$enable_diskerror = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_DISKERROR], [test x$enable_diskerror = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_DISKERROR], [USE_DISKERROR="yes"], [USE_DISKERROR="no"]) - - AC_ARG_ENABLE([memory_failure], - AS_HELP_STRING([--enable-memory-failure], [enable memory failure events (currently experimental)])) - --AS_IF([test "x$enable_memory_failure" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_memory_failure" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_MEMORY_FAILURE,1,"have memory failure events collect") - AC_SUBST([WITH_MEMORY_FAILURE]) - ]) --AM_CONDITIONAL([WITH_MEMORY_FAILURE], [test x$enable_memory_failure = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_MEMORY_FAILURE], [test x$enable_memory_failure = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_MEMORY_FAILURE], [USE_MEMORY_FAILURE="yes"], [USE_MEMORY_FAILURE="no"]) - - AC_ARG_ENABLE([abrt_report], - AS_HELP_STRING([--enable-abrt-report], [enable report event to ABRT (currently experimental)])) - --AS_IF([test "x$enable_abrt_report" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_abrt_report" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_ABRT_REPORT,1,"have report event to ABRT") - AC_SUBST([WITH_ABRT_REPORT]) - ]) --AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_ABRT_REPORT], [USE_ABRT_REPORT="yes"], [USE_ABRT_REPORT="no"]) - - AC_ARG_ENABLE([hisi_ns_decode], - AS_HELP_STRING([--enable-hisi-ns-decode], [enable HISI_NS_DECODE events (currently experimental)])) - --AS_IF([test "x$enable_hisi_ns_decode" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_hisi_ns_decode" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_HISI_NS_DECODE,1,"have HISI UNKNOWN_SEC events decode") - AC_SUBST([WITH_HISI_NS_DECODE]) - ]) --AM_CONDITIONAL([WITH_HISI_NS_DECODE], [test x$enable_hisi_ns_decode = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_HISI_NS_DECODE], [test x$enable_hisi_ns_decode = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_HISI_NS_DECODE], [USE_HISI_NS_DECODE="yes"], [USE_HISI_NS_DECODE="no"]) - - AC_ARG_ENABLE([memory_ce_pfa], - AS_HELP_STRING([--enable-memory-ce-pfa], [enable memory Corrected Error predictive failure analysis])) - --AS_IF([test "x$enable_memory_ce_pfa" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_memory_ce_pfa" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_MEMORY_CE_PFA,1,"have memory corrected error predictive failure analysis") - AC_SUBST([WITH_MEMORY_CE_PFA]) - ]) --AM_CONDITIONAL([WITH_MEMORY_CE_PFA], [test x$enable_memory_ce_pfa = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_MEMORY_CE_PFA], [test x$enable_memory_ce_pfa = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_MEMORY_CE_PFA], [USE_MEMORY_CE_PFA="yes"], [USE_MEMORY_CE_PFA="no"]) - - AC_ARG_ENABLE([amp_ns_decode], - AS_HELP_STRING([--enable-amp-ns-decode], [enable AMP_NS_DECODE events (currently experimental)])) - --AS_IF([test "x$enable_amp_ns_decode" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_amp_ns_decode" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_AMP_NS_DECODE,1,"have AMP UNKNOWN_SEC events decode") - AC_SUBST([WITH_AMP_NS_DECODE]) - ]) --AM_CONDITIONAL([WITH_AMP_NS_DECODE], [test x$enable_amp_ns_decode = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_AMP_NS_DECODE], [test x$enable_amp_ns_decode = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_AMP_NS_DECODE], [USE_AMP_NS_DECODE="yes"], [USE_AMP_NS_DECODE="no"]) - - test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc - diff --git a/app-admin/rasdaemon/rasdaemon-0.6.8-r2.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.8-r2.ebuild deleted file mode 100644 index 63c05654e834..000000000000 --- a/app-admin/rasdaemon/rasdaemon-0.6.8-r2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic linux-info systemd - -DESCRIPTION="Reliability, Availability and Serviceability logging tool" -HOMEPAGE="https://github.com/mchehab/rasdaemon" -SRC_URI="https://github.com/mchehab/rasdaemon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" - -DEPEND=" - dev-db/sqlite - elibc_musl? ( sys-libs/argp-standalone ) -" -RDEPEND=" - ${DEPEND} - dev-perl/DBI - dev-perl/DBD-SQLite - sys-apps/dmidecode -" -BDEPEND="sys-devel/gettext" - -PATCHES=( - "${FILESDIR}"/${PN}-0.6.8-bashisms-configure.patch -) - -pkg_setup() { - linux-info_pkg_setup - local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS" - check_extra_config -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - local myconfargs=( - --enable-sqlite3 - --enable-abrt-report - --enable-aer - --enable-arm - --enable-extlog - --enable-hisi-ns-decode - --enable-mce - --enable-non-standard - --enable-devlink - --enable-diskerror - --enable-memory-ce-pfa - --includedir="/usr/include/${PN}" - --localstatedir=/var - ) - - use elibc_musl && append-libs -largp - - econf "${myconfargs[@]}" -} - -src_install() { - default - - keepdir "/var/lib/${PN}" - - systemd_dounit misc/*.service - - newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon - newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl - newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon -} diff --git a/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild b/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild deleted file mode 100644 index c0ee30e744f2..000000000000 --- a/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic linux-info systemd - -DESCRIPTION="Reliability, Availability and Serviceability logging tool" -HOMEPAGE="https://github.com/mchehab/rasdaemon" -SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/v${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" - -DEPEND=" - dev-db/sqlite - elibc_musl? ( sys-libs/argp-standalone ) -" -RDEPEND=" - ${DEPEND} - dev-perl/DBI - dev-perl/DBD-SQLite - sys-apps/dmidecode -" -BDEPEND="sys-devel/gettext" - -pkg_setup() { - linux-info_pkg_setup - local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS" - check_extra_config -} - -src_configure() { - local myconfargs=( - --enable-sqlite3 - --enable-abrt-report - --enable-aer - --enable-arm - --enable-extlog - --enable-hisi-ns-decode - --enable-mce - --enable-non-standard - --enable-devlink - --enable-diskerror - --enable-memory-ce-pfa - --includedir="/usr/include/${PN}" - --localstatedir=/var - ) - - use elibc_musl && append-libs -largp - - econf "${myconfargs[@]}" -} - -src_install() { - default - - keepdir "/var/lib/${PN}" - - systemd_dounit misc/*.service - - newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon - newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl - newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon -} diff --git a/app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild b/app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild deleted file mode 100644 index aea9287acd6b..000000000000 --- a/app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic linux-info systemd - -DESCRIPTION="Reliability, Availability and Serviceability logging tool" -HOMEPAGE="https://github.com/mchehab/rasdaemon" -# This if can be dropped > 0.8.0, see https://github.com/mchehab/rasdaemon/issues/88 -if [[ ${PV} == 0.8.0 ]] ; then - SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/refs%2Fheads%2Fmaster/${P}.tar.bz2" -else - SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/v${PV}/${P}.tar.bz2" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" -IUSE="selinux" - -DEPEND=" - dev-db/sqlite - dev-libs/libtraceevent - elibc_musl? ( sys-libs/argp-standalone ) -" -RDEPEND=" - ${DEPEND} - dev-perl/DBI - dev-perl/DBD-SQLite - sys-apps/dmidecode - selinux? ( sec-policy/selinux-rasdaemon ) -" -BDEPEND="sys-devel/gettext" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8.0-bashisms-configure.patch -) - -pkg_setup() { - linux-info_pkg_setup - local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS" - check_extra_config -} - -src_prepare() { - default - - # Only here for 0.8.0's bashism patch - eautoreconf -} - -src_configure() { - local myconfargs=( - --enable-sqlite3 - --enable-abrt-report - --enable-aer - --enable-arm - --enable-extlog - --enable-hisi-ns-decode - --enable-mce - --enable-non-standard - --enable-devlink - --enable-diskerror - --enable-memory-ce-pfa - --includedir="/usr/include/${PN}" - --localstatedir=/var - ) - - use elibc_musl && append-libs -largp - - econf "${myconfargs[@]}" -} - -src_install() { - default - - keepdir "/var/lib/${PN}" - - systemd_dounit misc/*.service - - newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon - newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl - newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon -} diff --git a/app-admin/rasdaemon/rasdaemon-0.8.0.ebuild b/app-admin/rasdaemon/rasdaemon-0.8.0.ebuild deleted file mode 100644 index 932a683f6795..000000000000 --- a/app-admin/rasdaemon/rasdaemon-0.8.0.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic linux-info systemd - -DESCRIPTION="Reliability, Availability and Serviceability logging tool" -HOMEPAGE="https://github.com/mchehab/rasdaemon" -# This if can be dropped > 0.8.0, see https://github.com/mchehab/rasdaemon/issues/88 -if [[ ${PV} == 0.8.0 ]] ; then - SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/refs%2Fheads%2Fmaster/${P}.tar.bz2" -else - SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/v${PV}/${P}.tar.bz2" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" - -DEPEND=" - dev-db/sqlite - dev-libs/libtraceevent - elibc_musl? ( sys-libs/argp-standalone ) -" -RDEPEND=" - ${DEPEND} - dev-perl/DBI - dev-perl/DBD-SQLite - sys-apps/dmidecode -" -BDEPEND="sys-devel/gettext" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8.0-bashisms-configure.patch -) - -pkg_setup() { - linux-info_pkg_setup - local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS" - check_extra_config -} - -src_prepare() { - default - - # Only here for 0.8.0's bashism patch - eautoreconf -} - -src_configure() { - local myconfargs=( - --enable-sqlite3 - --enable-abrt-report - --enable-aer - --enable-arm - --enable-extlog - --enable-hisi-ns-decode - --enable-mce - --enable-non-standard - --enable-devlink - --enable-diskerror - --enable-memory-ce-pfa - --includedir="/usr/include/${PN}" - --localstatedir=/var - ) - - use elibc_musl && append-libs -largp - - econf "${myconfargs[@]}" -} - -src_install() { - default - - keepdir "/var/lib/${PN}" - - systemd_dounit misc/*.service - - newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon - newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl - newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon -} diff --git a/app-admin/redfishtool/metadata.xml b/app-admin/redfishtool/metadata.xml index 18acf7851c64..6415b21f48c3 100644 --- a/app-admin/redfishtool/metadata.xml +++ b/app-admin/redfishtool/metadata.xml @@ -1,10 +1,7 @@ <?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> + <!-- maintainer-needed --> <upstream> <remote-id type="pypi">redfishtool</remote-id> <remote-id type="github">DMTF/Redfishtool</remote-id> diff --git a/app-admin/redfishtool/redfishtool-1.1.8.ebuild b/app-admin/redfishtool/redfishtool-1.1.8.ebuild index 79a53b30f0b9..4c2064451254 100644 --- a/app-admin/redfishtool/redfishtool-1.1.8.ebuild +++ b/app-admin/redfishtool/redfishtool-1.1.8.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/DMTF/Redfishtool" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~riscv" RDEPEND=" dev-python/python-dateutil[${PYTHON_USEDEP}] diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest index 3aa1527fd16d..b8434950c777 100644 --- a/app-admin/restart-services/Manifest +++ b/app-admin/restart-services/Manifest @@ -1,2 +1,3 @@ DIST restart-services-0.17.0.tgz 25643 BLAKE2B 5999e12e38207d00266928504da05c00482c8297b7fee634f302f09cfa09e206bcf9d5a558d2a91e5de1d97318025fa995fbc3a61f0d0e74b8dfb1af3db8670b SHA512 c11ca431fbbc6899ab268e8979049144448479d953ed7373cc7483cca2c03cd4041a1ca1e47c0e810f91a18a43aa32cc305a4ea791e8b992246f972e0fbb19ab -DIST restart-services-1.0.tgz 25872 BLAKE2B 912c3e2c3cd49732369a5a4452be1f171c33cd3364cf3224b4443f6f21ef0fccd4c533edd79214cc2dae00cea558409eacbcef4b1566bef402f1850537432c63 SHA512 9c4e269ac6db8bf13c512cc3556a9356b4b44960dd562cf633df6e03db57677c05738edc46010b01976a6b0ee2152ac1e8d410a6c9d98142295ff0cbd3f93df2 +DIST restart-services-1.2.tgz 27526 BLAKE2B 3936a4145767f917d4f1c856c65ee2b6445b495988e77ada488ff4b43d87abaaca7b9d59e48c89c59a666559d0416d5cf1a6171c5d903ee0385dabb922929882 SHA512 815fb40c4616afaf2e27877a4cbba86c0d44432cbf4be04991431e71f5e495dcb92f66bda020dca47d5363388455fbeaa3f3e35d2e9451785301386c73f724c0 +DIST restart-services-1.3.tgz 27740 BLAKE2B b49fce16771c055aa93b8ac55f5eb37af18cc66b3c63152c276a34b6e8b6e953af651d190e167f036c003d9d615727b3efb382c9e770d55a8885974e9158a750 SHA512 1f45d333be5d342d2bc206380c1fbe4713d2e02d17547b7c9e648ee7be568900042b7e240c16e8d018020ecefd018a5564268c57a32fe3d9f2f660fc062bc45a diff --git a/app-admin/restart-services/restart-services-1.0.ebuild b/app-admin/restart-services/restart-services-1.2.ebuild index 6a24cf48136e..10daef1472d7 100644 --- a/app-admin/restart-services/restart-services-1.0.ebuild +++ b/app-admin/restart-services/restart-services-1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/app-admin/restart-services/restart-services-1.3-r1.ebuild b/app-admin/restart-services/restart-services-1.3-r1.ebuild new file mode 100644 index 000000000000..1526865f6a90 --- /dev/null +++ b/app-admin/restart-services/restart-services-1.3-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Tool to manage OpenRC and systemd services that need to be restarted" +HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/" +SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86" + +RDEPEND=" + app-admin/lib_users + app-portage/portage-utils + || ( sys-apps/openrc sys-apps/openrc-navi sys-apps/systemd ) +" + +src_install() { + dosbin restart-services + doman restart-services.1 + keepdir /etc/restart-services.d + insinto /etc + doins restart-services.conf + dodoc README CHANGES + + sed -i -e 's/^#include/include/' "${ED}"/etc/restart-services.conf || die + cat > "${ED}"/etc/restart-services.d/00-local.conf <<- EOF || die + # You may put your local changes here or in any other *.conf file + # in this directory so you can leave /etc/restart-services.conf as is. + # Example: + # *extend* SV_ALWAYS to match 'myservice' + # SV_ALWAYS+=( myservice ) + EOF +} diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index 60ce26b8c5af..8a0de37a0042 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,6 +1,4 @@ -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-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 +DIST rsyslog-8.2404.0.tar.gz 3408657 BLAKE2B 67170f1ba4ad61bd79088a313ee9b093ecaab512ce24ca56cfe605d4589276406abe593d791736ecb7b2f44be998b3836173272eb5dd69f7bc9ea8d5b49d462e SHA512 fda8032ab7f9cb6c46693edeb95d2b47ab7673836ff44d0686bbbd5a3759885f65a80e1a311c809c2332a19559b0297ac7d8e59e5f828372839f67dbf362e6b1 +DIST rsyslog-8.2406.0.tar.gz 3412827 BLAKE2B c75bfba02cd9d28effb2dd64b6b665b71b46fe6e47a9e12dbe5a6735fdb59373585d655334da64e89c11cbeb0f36a1563562a9c65ead3c2747f876fd0664d800 SHA512 e7c930f9b35b73591c1655afa25408c325c967114550996caa5840331c8f089563536c8efe52588c1b727db7f27bdae9b5ba619222e050d618a3f067de1bcbd0 +DIST rsyslog-doc-8.2404.0.tar.gz 6568723 BLAKE2B 4bc522f9146754a9ebae5f5f7ffb87cfa2da3d9b0832b902c73896d788a061ad4b99cd269b4fb8fc42917311ea5621dfd398428046c53883e9bba859252172ec SHA512 ea88fcf81fb45be515f1b8e7699efabba98eb7e5fcd2d5046424c303db95926a36baa1215143c05e39b9a86dcfdbc73c5c3a76dee382d7b8f1916653169df264 +DIST rsyslog-doc-8.2406.0.tar.gz 6568856 BLAKE2B c8e1dc2bf9eac465dfebd73539b4b81ec57a5a25723673f2b00477b2e60203f10614206d39a496981adcd348c44c6f455f83e56455902892719617ff136038ff SHA512 8c48bf109e105b2e92e076436e8771f55a1c6a595e525c7fce8720fc675aba4a8897eda076ff9b9369eacc8583e76ea05d056899dee1b6d97f918ff2fd55aced diff --git a/app-admin/rsyslog/files/50-default-r2.conf b/app-admin/rsyslog/files/50-default-r2.conf new file mode 100644 index 000000000000..07f27b6820a1 --- /dev/null +++ b/app-admin/rsyslog/files/50-default-r2.conf @@ -0,0 +1,103 @@ +####################### +### DEFAULT ACTIONS ### +####################### + +auth,authpriv.* action( + name="action_auth" + type="omfile" + File="/var/log/auth.log" + FileCreateMode="0600" + FileOwner="root" + FileGroup="adm" + Sync="off" +) + +cron.* action( + name="action_cron" + type="omfile" + File="/var/log/cron.log" + FileOwner="root" + FileGroup="adm" +) + +daemon.* action( + name="action_daemon" + type="omfile" + File="/var/log/daemon.log" + FileOwner="root" + FileGroup="adm" +) + +kern.* action( + name="action_kern" + type="omfile" + File="/var/log/kern.log" + FileOwner="root" + FileGroup="adm" +) + +lpr.* action( + name="action_lpr" + type="omfile" + File="/var/log/lpr.log" + FileOwner="root" + FileGroup="adm" +) + +mail.* action( + name="action_mail" + type="omfile" + File="/var/log/mail.log" + FileOwner="root" + FileGroup="adm" +) + +news.* action( + name="action_news" + type="omfile" + File="/var/log/news.log" + FileOwner="root" + FileGroup="adm" +) + +user.* action( + name="action_user" + type="omfile" + File="/var/log/user.log" + FileOwner="root" + FileGroup="adm" +) + +*.=debug;auth,authpriv,news,mail.none action( + name="action_debug" + type="omfile" + File="/var/log/debug.log" + FileOwner="root" + FileGroup="adm" +) + +*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action( + name="action_messages" + type="omfile" + File="/var/log/messages" + FileOwner="root" + FileGroup="adm" +) + +# Uncomment the following directive to re-enable the +# deprecated "/var/log/syslog" log file (don't forget to re-enable log +# rotation in "/etc/logrotate.d/rsyslog" if you do that!) +#*.*;auth,authpriv.none action( +# name="action_syslog" +# type="omfile" +# File="/var/log/syslog" +# FileOwner="root" +# FileGroup="adm" +#) + +*.emerg action( + name="action_emerge" + type="omusrmsg" + Users="*" + action.execOnlyOnceEveryInterval="10" +) diff --git a/app-admin/rsyslog/files/README.gentoo-r1 b/app-admin/rsyslog/files/README.gentoo-r1 new file mode 100644 index 000000000000..cdb2c2e5a046 --- /dev/null +++ b/app-admin/rsyslog/files/README.gentoo-r1 @@ -0,0 +1,39 @@ +Introduction +============ + +Since rsyslog version 7.6 we are shipping a new default Gentoo +configuration. See bug #501982 to learn more about what we were trying to +achieve by rewriting the entire configuration. + + +Important changes +================= + +1. "/var/log/syslog" log file is now deprecated + + Beginning with rsyslog-7.6, the "/var/log/syslog" log file will no + longer being written per default. We are considering this file as + deprecated/obsolet for the typical user/system. + The content from this log file is still availble through other + (dedicated) log files, see + + - /var/log/cron.log + - /var/log/daemon.log + - /var/log/mail.log + - /var/log/messages + + If you really need the old "/var/log/syslog" log file, all you have to + do is uncommenting the corresponding configuration directive in + "/etc/rsyslog.d/50-default.conf". + + If you do so, don't forget to re-enable log rotation in + "/etc/logrotate.d/rsyslog", too. + + +2. "/var/empty/dev/log" no longer default + + Before version 8.2404.0-r1 there was an additional input socket in + "/var/empty/dev/log" (default chroot location) in 8.2404.0-r1 that socket + was removed from the default configuration. Users can enable that socket + if they need to on their own but it shouldn't be necessary when running new + versions of OpenSSH. diff --git a/app-admin/rsyslog/rsyslog-8.2312.0.ebuild b/app-admin/rsyslog/rsyslog-8.2404.0-r1.ebuild index 166eeab07c63..c7f75574f69e 100644 --- a/app-admin/rsyslog/rsyslog-8.2312.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2404.0-r1.ebuild @@ -8,9 +8,10 @@ PYTHON_COMPAT=( python3_{10..12} ) inherit autotools linux-info python-any-r1 systemd DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="https://www.rsyslog.com/" +HOMEPAGE="https://www.rsyslog.com/ + https://github.com/rsyslog/rsyslog/" -if [[ "${PV}" == "9999" ]]; then +if [[ "${PV}" == *9999* ]]; then EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" @@ -18,10 +19,12 @@ if [[ "${PV}" == "9999" ]]; then else SRC_URI=" https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz - doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) + doc? ( + https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz + ) " - KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86" fi LICENSE="GPL-3 LGPL-3 Apache-2.0" @@ -152,7 +155,7 @@ src_unpack() { mkdir docs || die "Failed to create docs directory" cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${PN}-doc-${PV}.tar.gz + unpack "${PN}-doc-${PV}.tar.gz" fi fi } @@ -190,12 +193,12 @@ src_configure() { # upstream PR 129 and 136) so we need to export HIREDIS_* # variables because rsyslog's build system depends on pkg-config. - if use redis; then + if use redis ; then export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" fi - local myeconfargs=( + local -a myeconfargs=( --disable-debug-symbols --disable-generate-man-pages --without-valgrind-testbench @@ -284,7 +287,6 @@ src_configure() { $(use_enable uuid) $(use_enable zeromq imczmq) $(use_enable zeromq omczmq) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) econf "${myeconfargs[@]}" @@ -329,13 +331,13 @@ src_test() { } src_install() { - local DOCS=( + local -a DOCS=( AUTHORS ChangeLog - "${FILESDIR}"/README.gentoo + "${FILESDIR}"/README.gentoo-r1 ) - use doc && local HTML_DOCS=( "${S}/docs/build/." ) + use doc && local -a HTML_DOCS=( "${S}/docs/build/." ) default @@ -344,7 +346,6 @@ src_install() { systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service - keepdir /var/empty/dev keepdir /var/spool/${PN} keepdir /etc/ssl/${PN} keepdir /etc/${PN}.d @@ -353,7 +354,7 @@ src_install() { newins "${FILESDIR}/${PN}.conf" ${PN}.conf insinto /etc/rsyslog.d/ - newins "${FILESDIR}/50-default-r1.conf" 50-default.conf + newins "${FILESDIR}/50-default-r2.conf" 50-default.conf insinto /etc/logrotate.d/ newins "${FILESDIR}/${PN}-r1.logrotate" ${PN} @@ -408,9 +409,10 @@ pkg_postinst() { } pkg_config() { - if ! use ssl; then + if ! use ssl ; then einfo "There is nothing to configure for rsyslog unless you" einfo "used USE=ssl to build it." + return 0 fi diff --git a/app-admin/rsyslog/rsyslog-8.2402.0.ebuild b/app-admin/rsyslog/rsyslog-8.2404.0.ebuild index bb01f397f550..95315d04e1e0 100644 --- a/app-admin/rsyslog/rsyslog-8.2402.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2404.0.ebuild @@ -24,7 +24,7 @@ else ) " - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86" fi LICENSE="GPL-3 LGPL-3 Apache-2.0" diff --git a/app-admin/rsyslog/rsyslog-8.2310.0.ebuild b/app-admin/rsyslog/rsyslog-8.2406.0.ebuild index 94d0e88e7958..514cb65782b2 100644 --- a/app-admin/rsyslog/rsyslog-8.2310.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2406.0.ebuild @@ -3,26 +3,28 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools linux-info python-any-r1 systemd DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="https://www.rsyslog.com/" +HOMEPAGE="https://www.rsyslog.com/ + https://github.com/rsyslog/rsyslog/" -if [[ ${PV} == "9999" ]]; then +if [[ "${PV}" == *9999* ]]; then EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" inherit git-r3 else - KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86" - SRC_URI=" https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz - doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) + doc? ( + https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz + ) " + + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86" fi LICENSE="GPL-3 LGPL-3 Apache-2.0" @@ -107,7 +109,7 @@ DEPEND=" elibc_musl? ( sys-libs/queue-standalone ) " -if [[ ${PV} == "9999" ]]; then +if [[ "${PV}" == "9999" ]]; then BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" BDEPEND+=" >=app-alternatives/lex-2.5.39-r1" BDEPEND+=" >=app-alternatives/yacc-2.4.3" @@ -117,26 +119,27 @@ fi CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" -PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch ) +PATCHES=( "${FILESDIR}/${PN}-8.2112.0-pr5024-configure.patch" ) pkg_setup() { use test && python-any-r1_pkg_setup } src_unpack() { - if [[ ${PV} == "9999" ]]; then + if [[ "${PV}" == "9999" ]]; then git-r3_fetch git-r3_checkout else - unpack ${P}.tar.gz + unpack "${P}.tar.gz" fi if use doc; then - if [[ ${PV} == "9999" ]]; then + if [[ "${PV}" == "9999" ]]; then local _EGIT_BRANCH= if [[ -n "${EGIT_BRANCH}" ]]; then # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} + _EGIT_BRANCH="${EGIT_BRANCH}" + unset EGIT_BRANCH fi @@ -151,7 +154,8 @@ src_unpack() { cd "${S}" || die "Cannot change dir into '${S}'" mkdir docs || die "Failed to create docs directory" cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${PN}-doc-${PV}.tar.gz + + unpack "${PN}-doc-${PV}.tar.gz" fi fi } @@ -189,12 +193,12 @@ src_configure() { # upstream PR 129 and 136) so we need to export HIREDIS_* # variables because rsyslog's build system depends on pkg-config. - if use redis; then + if use redis ; then export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" fi - local myeconfargs=( + local -a myeconfargs=( --disable-debug-symbols --disable-generate-man-pages --without-valgrind-testbench @@ -283,7 +287,6 @@ src_configure() { $(use_enable uuid) $(use_enable zeromq imczmq) $(use_enable zeromq omczmq) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) econf "${myeconfargs[@]}" @@ -328,13 +331,13 @@ src_test() { } src_install() { - local DOCS=( + local -a DOCS=( AUTHORS ChangeLog - "${FILESDIR}"/README.gentoo + "${FILESDIR}"/README.gentoo-r1 ) - use doc && local HTML_DOCS=( "${S}/docs/build/." ) + use doc && local -a HTML_DOCS=( "${S}/docs/build/." ) default @@ -343,7 +346,6 @@ src_install() { systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service - keepdir /var/empty/dev keepdir /var/spool/${PN} keepdir /etc/ssl/${PN} keepdir /etc/${PN}.d @@ -352,7 +354,7 @@ src_install() { newins "${FILESDIR}/${PN}.conf" ${PN}.conf insinto /etc/rsyslog.d/ - newins "${FILESDIR}/50-default-r1.conf" 50-default.conf + newins "${FILESDIR}/50-default-r2.conf" 50-default.conf insinto /etc/logrotate.d/ newins "${FILESDIR}/${PN}-r1.logrotate" ${PN} @@ -407,9 +409,10 @@ pkg_postinst() { } pkg_config() { - if ! use ssl; then + if ! use ssl ; then einfo "There is nothing to configure for rsyslog unless you" einfo "used USE=ssl to build it." + return 0 fi diff --git a/app-admin/sagan/Manifest b/app-admin/sagan/Manifest index 75ebb958f0e6..dc7df56a43a2 100644 --- a/app-admin/sagan/Manifest +++ b/app-admin/sagan/Manifest @@ -1 +1,2 @@ DIST sagan-2.0.1.tar.gz 487936 BLAKE2B 84a137bb0001c6758979d17cf67442262f732f7d49ce397183c0c226d6135e2c3cd8362452ef6b893e75a9cf5e874256d88f740b94df0dfa39587fc771ad4f8d SHA512 0cc288b67f641346bb0dbfcac2682c8c2b09e3e508b94dd5b2d5a81c2a80c7989f1d54725041210511877bd6b2338e8b0fdcae01f7084d39d48abef073d1fe64 +DIST sagan-2.0.2.tar.gz 323114 BLAKE2B f94864fc6ac0c05b17a01a4912afd5e9ea6665e188f64a6af4a635c5f1d53c47f20f9cf642e9fd088e6c73a1b732ad6a92ed9c071a6e66aa15c601a5946f3ccd SHA512 4753e984156c930b390e06802e918c2660e802fb1f07d7e014898f375fe4f8fd787a5b96e239998fed720147bc9a22906b42c75a88cc2695c1d836187d957817 diff --git a/app-admin/sagan/sagan-2.0.2.ebuild b/app-admin/sagan/sagan-2.0.2.ebuild new file mode 100644 index 000000000000..5affe4b6f28b --- /dev/null +++ b/app-admin/sagan/sagan-2.0.2.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic tmpfiles systemd + +DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system" +HOMEPAGE="https://github.com/quadrantsec/sagan" +SRC_URI="https://github.com/quadrantsec/${PN}/archive/refs/tags/v,2,0.2.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-v-2-0.2/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="geoip +libdnet mysql redis +pcap smtp" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + acct-group/sagan + acct-user/sagan + app-admin/sagan-rules + dev-libs/libestr + dev-libs/libfastjson:= + dev-libs/liblognorm + dev-libs/libpcre + dev-libs/libyaml + geoip? ( dev-libs/geoip ) + redis? ( dev-libs/hiredis:= ) + pcap? ( net-libs/libpcap ) + smtp? ( net-libs/libesmtp:= ) +" + +# Package no longer logs directly to a database +# and relies on Unified2 format to accomplish it +RDEPEND=" + ${DEPEND} + mysql? ( net-analyzer/barnyard2[mysql] ) +" + +REQUIRED_USE="mysql? ( libdnet )" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-flags -fcommon + + # TODO: poke at strstr logic and enable/disable CPU_FLAGS_X86_* + # accordingly? + # Note that not all of these are used: + # https://github.com/quadrantsec/sagan/blob/main/m4/ax_ext.m4 + local myeconfargs=( + --enable-lognorm + $(use_enable smtp esmtp) + $(use_enable redis) + $(use_enable pcap libpcap) + $(use_enable geoip) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # No need to create this at build/install time + rm -r "${ED}"/var/run/ || die + + # Fix paths in config file + sed -i \ + -e "s:/usr/local/:${EPREFIX}/:" \ + -e "s:/var/run/sagan:${EPREFIX}/run/sagan:" \ + "${ED}"/etc/sagan.yaml || die + + diropts -g sagan -o sagan -m 750 + # bug #775902 + keepdir /var/sagan/{,fifo} + keepdir /var/log/sagan/{,stats} + + fowners sagan:sagan /var/log/sagan/{,stats} + + touch "${ED}"/var/log/sagan/sagan.log || die + fowners sagan:sagan /var/log/sagan/sagan.log || die + + newinitd "${FILESDIR}"/sagan.init-r1 sagan + newconfd "${FILESDIR}"/sagan.confd sagan + + systemd_dounit "${FILESDIR}"/sagan.service + newtmpfiles "${FILESDIR}"/sagan.tmpfiles sagan.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}"/sagan.logrotate sagan + + docinto examples + dodoc -r extra/* +} + +pkg_preinst() { + # bug #775902 revealed that we need 750 on /var/log/sagan or e.g. + # logrotate will fail. Let's inform the user to fix up permissions + # in such a case. + # (fperms won't modify the live filesystem.) + HAD_BROKEN_PERMS=0 + + if has_version "<app-admin/sagan-2.0.1-r4" ; then + HAD_BROKEN_PERMS=1 + fi +} + +pkg_postinst() { + tmpfiles_process sagan.conf + + if [[ "${HAD_BROKEN_PERMS}" -eq 1 ]] ; then + ewarn "Please fix the permissions on ${EPREFIX}/var/log/sagan:" + ewarn "e.g. chmod 750 ${EPREFIX}/var/log/sagan" + ewarn "See bug #775902" + fi + + if use smtp; then + ewarn "You have enabled smtp use flag. If you plan on using Sagan with" + ewarn "email, create valid writable home directory for user 'sagan'" + ewarn "For security reasons it was created with /dev/null home directory" + fi + + einfo "For configuration assistance see" + einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO" +} diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index 6175950c1ad8..e2718884de8b 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -1,3 +1,5 @@ DIST salt-3005.5.tar.gz 17940104 BLAKE2B c7a820bc946c2cd8124fb6f559608ab1dc3cd85d6f0e7d0a2a87b7bc0dda361178e83b307c2fecd8a47d59032f85dc9f4caeef5698e98c0e349d1c6979f9f68a SHA512 1332c9751a225dbf569601eb1932fe3ebea93c8d8be7485b1b8150d5200ad2e82954c970d59ba0e888860062d059db78a50bffe69fc367bdb7b2388b62e19f32 DIST salt-3006.5.tar.gz 20536455 BLAKE2B cf475dc5e919f6ab180578db2aae5f3655623b39b134d67609da4f607be909340c6e55c940cfb66f129cc75d40b5cdda094e866db116d8a45aa5eef26d8fa1eb SHA512 8aaf5c5d36d8aa17b3fe867cee470f7b3c5dd1f6abaf5bdb49a3df76d3498d0dc1fa305a069bc95ad057489db229454b38b0ea9c1ade1e46b5d9b57aeef10c23 DIST salt-3006.7.tar.gz 20562663 BLAKE2B b4ff9039509b1de7151060cb0e68252868d493e114e327a3c48bfc5584f67521a2106b41b77377f6d43ab5795399b6fe5860ce8e091459687c4a5b2378752729 SHA512 9d1759a7c0dfc9ad4fdc94460f0f3799483737207bfdc8ddd1424e5c6083ea74ef520f13c323d5cbd7f65c1d9bb13bbbeb5f2cafe6dcacbc2689e733794aef2d +DIST salt-3007.0.tar.gz 20304228 BLAKE2B 3db95ce779cfd08d61536dcfb4ff6ac31788ad1d6d4665b640dcc430f5a33847f231f94fd574c5d8df7b14e2854511c80610a37cd19be5429c4643be8bd9e0eb SHA512 0e49d76dafdb981ee380ea89ceba2cddeae8cd95df1d188a6f8ba64a175c606aaf2f8101bacb040792255afdb46ae668cbc9464d0dbb055986e85cee4d5c130b +DIST salt-3007.1.tar.gz 19401831 BLAKE2B ea8c89a24991467367dc0c50e3d2f864e2f6211ba9a71195d6308a86df16229fc77baa2ec837f043ebad36d9d7a6673fefa3a1a826472d900925e657e2152718 SHA512 732820bae98ce2eb74175a2c37c986076572e0e60d04a270861fd3b0b6871cd2cc703683a8c0d97ffc43b2f7fffb76ae709a1aea839d10abc9f5d0837eaade4b diff --git a/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch b/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch deleted file mode 100644 index ff47115af210..000000000000 --- a/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt -index eb4d796418..ffa1589043 100644 ---- a/requirements/zeromq.txt -+++ b/requirements/zeromq.txt -@@ -1,6 +1,4 @@ - -r base.txt - -r crypto.txt - --pyzmq<=20.0.0 ; python_version < "3.6" --pyzmq>=17.0.0 ; python_version < "3.9" --pyzmq>19.0.2 ; python_version >= "3.9" -+pyzmq diff --git a/app-admin/salt/files/salt-3006.3-tests.patch b/app-admin/salt/files/salt-3006.3-tests.patch deleted file mode 100644 index 4d30608775cb..000000000000 --- a/app-admin/salt/files/salt-3006.3-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/tests/pytests/unit/utils/event/test_event.py b/tests/pytests/unit/utils/event/test_event.py -index e289e72dad..2abd4066c4 100644 ---- a/tests/pytests/unit/utils/event/test_event.py -+++ b/tests/pytests/unit/utils/event/test_event.py -@@ -300,7 +300,7 @@ def test_connect_pull_should_debug_log_on_StreamClosedError(): - event = SaltEvent(node=None) - with patch.object(event, "pusher") as mock_pusher: - with patch.object( -- salt.utils.event.log, "debug", auto_spec=True -+ salt.utils.event.log, "debug", auto_spec=True, unsafe=True - ) as mock_log_debug: - mock_pusher.connect.side_effect = ( - salt.ext.tornado.iostream.StreamClosedError -@@ -317,10 +317,10 @@ def test_connect_pull_should_error_log_on_other_errors(error): - event = SaltEvent(node=None) - with patch.object(event, "pusher") as mock_pusher: - with patch.object( -- salt.utils.event.log, "debug", auto_spec=True -+ salt.utils.event.log, "debug", auto_spec=True, unsafe=True - ) as mock_log_debug: - with patch.object( -- salt.utils.event.log, "error", auto_spec=True -+ salt.utils.event.log, "error", auto_spec=True, unsafe=True - ) as mock_log_error: - mock_pusher.connect.side_effect = error - event.connect_pull() diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml index 4e6f05022cda..e3b53caae59a 100644 --- a/app-admin/salt/metadata.xml +++ b/app-admin/salt/metadata.xml @@ -39,6 +39,5 @@ backbone of cloud and data center management. </use> <upstream> <remote-id type="pypi">salt</remote-id> - <remote-id type="github">saltstack/salt-vim</remote-id> </upstream> </pkgmetadata> diff --git a/app-admin/salt/salt-3005.5-r1.ebuild b/app-admin/salt/salt-3005.5-r1.ebuild index 00992ac88f15..f03f25365305 100644 --- a/app-admin/salt/salt-3005.5-r1.ebuild +++ b/app-admin/salt/salt-3005.5-r1.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then EGIT_BRANCH="develop" else inherit pypi - KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" + KEYWORDS="amd64 arm64 ~riscv x86" fi LICENSE="Apache-2.0" diff --git a/app-admin/salt/salt-3006.7-r1.ebuild b/app-admin/salt/salt-3006.7-r1.ebuild index e9171e89adf7..6536ba08a015 100644 --- a/app-admin/salt/salt-3006.7-r1.ebuild +++ b/app-admin/salt/salt-3006.7-r1.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then EGIT_BRANCH="develop" else inherit pypi - KEYWORDS="~amd64 ~riscv ~x86" + KEYWORDS="amd64 ~riscv ~x86" fi LICENSE="Apache-2.0" @@ -334,6 +334,9 @@ python_test() { tests/unit/test_master.py::TransportMethodsTest::test_aes_funcs_black tests/unit/test_master.py::TransportMethodsTest::test_clear_funcs_black ) + [[ ${EPYTHON#*.} -ge 12 ]] && EPYTEST_DESELECT+=( + tests/integration/modules/test_hosts.py::HostsModuleTest::test_set_host + ) # testsuite likes lots of files ulimit -n 4096 || die diff --git a/app-admin/salt/salt-3007.0-r1.ebuild b/app-admin/salt/salt-3007.0-r1.ebuild new file mode 100644 index 000000000000..13e5222fc45f --- /dev/null +++ b/app-admin/salt/salt-3007.0-r1.ebuild @@ -0,0 +1,610 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_1{0..2} ) + +DISTUTILS_USE_PEP517=setuptools +inherit systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="https://www.saltstack.com/resources/community/ + https://github.com/saltstack" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" +else + inherit pypi + KEYWORDS="amd64 ~riscv ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE=" + cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako + mongodb neutron nova portage profile redis selinux test raet + +zeromq vim-syntax +" + +RDEPEND=" + sys-apps/pciutils + dev-libs/openssl:0=[-bindist(-)] + dev-python/aiohttp[${PYTHON_USEDEP}] + >=dev-python/cherrypy-18.6.1[${PYTHON_USEDEP}] + >=dev-python/cryptography-42.0.0[${PYTHON_USEDEP}] + >=dev-python/distro-1.5[${PYTHON_USEDEP}] + dev-python/importlib-metadata[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.3[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + dev-python/looseversion[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] + >=dev-python/packaging-21.3[${PYTHON_USEDEP}] + >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.19.1[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-24.0.0[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}] + dev-python/python-gnupg[${PYTHON_USEDEP}] + >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}] + >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}] + >=dev-python/requests-2.31.0[${PYTHON_USEDEP}] + dev-python/setproctitle[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}] + dev-python/tornado[${PYTHON_USEDEP}] + dev-python/watchdog[${PYTHON_USEDEP}] + libcloud? ( + >=dev-python/aiohttp-3.9.0[${PYTHON_USEDEP}] + dev-python/aiosignal[${PYTHON_USEDEP}] + >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}] + dev-python/async-timeout[${PYTHON_USEDEP}] + ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( + dev-python/libvirt-python[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] ) + genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + nova? ( + $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3.1{0..1}) + ) + neutron? ( + $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3.1{0..1}) + ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim ) + zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) +" +BDEPEND=" + sys-apps/findutils + dev-python/build[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + app-arch/zip + dev-python/apache-libcloud[${PYTHON_USEDEP}] + dev-python/boto3[${PYTHON_USEDEP}] + >=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}] + dev-python/cherrypy[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/moto-2.0.0[${PYTHON_USEDEP}] + <dev-python/moto-5[${PYTHON_USEDEP}] + dev-python/passlib[${PYTHON_USEDEP}] + dev-python/bcrypt[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/pygit2[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}] + >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-factories-1.0.0_rc29[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + dev-python/pytest-subtests[${PYTHON_USEDEP}] + dev-python/pytest-shell-utilities[${PYTHON_USEDEP}] + dev-python/pytest-skip-markers[${PYTHON_USEDEP}] + dev-python/pytest-system-statistics[${PYTHON_USEDEP}] + dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + net-dns/bind-tools + >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}] + dev-util/yamllint[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] ) + ) +" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE=" + || ( raet zeromq ) + test? ( cheetah genshi ) + nova? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) + neutron? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) +" +RESTRICT=" + !test? ( test ) + x86? ( test ) +" + +PATCHES=( + "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" +) + +python_prepare_all() { + local -a remove_test_files=( + # remove tests with external dependencies that may not be available, and + # tests that don't work in sandbox + tests/integration/externalapi/test_venafiapi.py + tests/integration/modules/test_rabbitmq.py + tests/integration/modules/test_supervisord.py + tests/integration/states/test_match.py + tests/pytests/functional/fileserver/hgfs/test_hgfs.py + tests/pytests/functional/loader/test_loader.py + tests/pytests/functional/modules/file/test_readlink.py + tests/pytests/functional/modules/file/test_symlink.py + tests/pytests/functional/modules/state/test_jinja_filters.py + tests/pytests/functional/modules/state/test_jinja_renderer.py + tests/pytests/functional/modules/state/test_mako_renderer.py + tests/pytests/functional/modules/state/test_pyobjects_renderer.py + tests/pytests/functional/modules/test_aptpkg.py + tests/pytests/functional/modules/test_dockermod.py + tests/pytests/functional/modules/test_etcd_mod.py + tests/pytests/functional/modules/test_grains.py + tests/pytests/functional/modules/test_mac_service.py + tests/pytests/functional/modules/test_saltcheck.py + tests/pytests/functional/modules/test_saltutil.py + tests/pytests/functional/modules/test_test.py + tests/pytests/functional/pillar/hg_pillar/test_hg_pillar.py + tests/pytests/functional/pillar/test_git_pillar.py + tests/pytests/functional/pillar/test_gpg.py + tests/pytests/functional/returners/test_etcd_return.py + tests/pytests/functional/runners/test_winrepo.py + tests/pytests/functional/sdb/test_etcd_db.py + tests/pytests/functional/state/test_masterless_tops.py + tests/pytests/functional/states/file/test_keyvalue.py + tests/pytests/functional/states/file/test_patch.py + tests/pytests/functional/states/file/test_rename.py + tests/pytests/functional/states/rabbitmq + tests/pytests/functional/states/test_docker_container.py + tests/pytests/functional/states/test_docker_network.py + tests/pytests/functional/states/test_etcd_mod.py + tests/pytests/functional/states/test_module.py + tests/pytests/functional/states/test_mysql.py + tests/pytests/functional/states/test_svn.py + tests/pytests/functional/states/test_virtualenv_mod.py + tests/pytests/functional/test_version.py + tests/pytests/functional/utils/test_vault.py + tests/pytests/integration/cli/test_syndic_eauth.py + tests/pytests/integration/daemons/test_memory_leak.py + tests/pytests/integration/grains/test_grains.py + tests/pytests/integration/master/test_clear_funcs.py + tests/pytests/integration/minion/test_reauth.py + tests/pytests/integration/modules/grains/test_append.py + tests/pytests/integration/modules/grains/test_module.py + tests/pytests/integration/modules/saltutil/test_grains.py + tests/pytests/integration/modules/saltutil/test_modules.py + tests/pytests/integration/modules/saltutil/test_wheel.py + tests/pytests/integration/modules/state/test_state_pillar_errors.py + tests/pytests/integration/modules/state/test_state_test.py + tests/pytests/integration/modules/test_cmdmod.py + tests/pytests/integration/modules/test_event.py + tests/pytests/integration/modules/test_file.py + tests/pytests/integration/modules/test_jinja.py + tests/pytests/integration/modules/test_pillar.py + tests/pytests/integration/modules/test_pip.py + tests/pytests/integration/modules/test_vault.py + tests/pytests/integration/modules/test_virt.py + tests/pytests/integration/modules/test_x509_v2.py + tests/pytests/integration/proxy/test_deltaproxy.py + tests/pytests/integration/proxy/test_shell.py + tests/pytests/integration/reactor/test_reactor.py + tests/pytests/integration/returners/test_noop_return.py + tests/pytests/integration/runners/state/orchestrate/test_orchestrate.py + tests/pytests/integration/runners/test_cache.py + tests/pytests/integration/runners/test_jobs.py + tests/pytests/integration/runners/test_manage.py + tests/pytests/integration/runners/test_saltutil.py + tests/pytests/integration/runners/test_vault.py + tests/pytests/integration/sdb/test_vault.py + tests/pytests/integration/ssh/state/test_pillar_override.py + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_requisite_fail.py + tests/pytests/integration/ssh/state/test_retcode_pillar_render_exception.py + tests/pytests/integration/ssh/state/test_retcode_render_exception.py + tests/pytests/integration/ssh/state/test_retcode_render_module_exception.py + tests/pytests/integration/ssh/state/test_retcode_run_fail.py + tests/pytests/integration/ssh/state/test_retcode_state_run_remote_exception.py + tests/pytests/integration/ssh/state/test_state.py + tests/pytests/integration/ssh/state/test_with_import_dir.py + tests/pytests/integration/ssh/test_cmdmod.py + tests/pytests/integration/ssh/test_config.py + tests/pytests/integration/ssh/test_cp.py + tests/pytests/integration/ssh/test_deploy.py + tests/pytests/integration/ssh/test_grains.py + tests/pytests/integration/ssh/test_jinja_mods.py + tests/pytests/integration/ssh/test_master.py + tests/pytests/integration/ssh/test_mine.py + tests/pytests/integration/ssh/test_pillar.py + tests/pytests/integration/ssh/test_pillar_compilation.py + tests/pytests/integration/ssh/test_pre_flight.py + tests/pytests/integration/ssh/test_publish.py + tests/pytests/integration/ssh/test_py_versions.py + tests/pytests/integration/ssh/test_raw.py + tests/pytests/integration/ssh/test_saltcheck.py + tests/pytests/integration/ssh/test_slsutil.py + tests/pytests/integration/states/test_beacon.py + tests/pytests/integration/states/test_file.py + tests/pytests/integration/states/test_include.py + tests/pytests/integration/states/test_ini_manage.py + tests/pytests/integration/states/test_state_test.py + tests/pytests/integration/states/test_x509_v2.py + tests/pytests/integration/utils/test_templates.py + tests/pytests/integration/wheel/test_key.py + tests/pytests/pkg/integration/test_check_imports.py + tests/pytests/pkg/integration/test_clean_zmq_teardown.py + tests/pytests/pkg/integration/test_enabled_disabled.py + tests/pytests/pkg/integration/test_help.py + tests/pytests/pkg/integration/test_logrotate_config.py + tests/pytests/pkg/integration/test_pkg.py + tests/pytests/pkg/integration/test_python.py + tests/pytests/scenarios/compat/test_with_versions.py + tests/pytests/unit/loader/test_lazy.py + tests/pytests/unit/modules/test_mongodb.py + tests/pytests/unit/modules/test_mysql.py + tests/pytests/unit/modules/test_schedule.py + tests/pytests/unit/pillar/test_consul_pillar.py + tests/pytests/unit/pillar/test_mysql.py + tests/pytests/unit/renderers/test_yamlex.py + tests/pytests/unit/roster/test_ansible.py + tests/pytests/unit/roster/test_dir.py + tests/pytests/unit/runners/test_reactor.py + tests/pytests/unit/states/file/test_keyvalue.py + tests/pytests/unit/utils/jinja/test_get_template.py + tests/pytests/unit/utils/jinja/test_salt_cache_loader.py + tests/pytests/unit/utils/test_cache.py + tests/pytests/unit/utils/test_etcd_util.py + tests/pytests/unit/utils/test_package.py + tests/pytests/unit/utils/test_versions.py + tests/unit/ext/test_ipaddress.py + tests/unit/modules/test_boto_elb.py + tests/unit/modules/test_boto_secgroup.py + tests/unit/modules/test_boto_vpc.py + tests/unit/modules/test_elasticsearch.py + tests/unit/modules/test_k8s.py + tests/unit/modules/test_kubernetesmod.py + tests/unit/modules/test_vsphere.py + tests/unit/netapi/rest_tornado/test_saltnado.py + tests/unit/states/test_boto_vpc.py + tests/unit/states/test_module.py + tests/unit/test_module_names.py + tests/unit/test_zypp_plugins.py + tests/unit/utils/test_extend.py + tests/unit/utils/test_pbm.py + tests/unit/utils/test_schema.py + tests/unit/utils/test_vmware.py + tests/unit/utils/test_vsan.py + + # tests that require network access + tests/integration/cloud + tests/integration/netapi + tests/kitchen/test_kitchen.py + tests/kitchen/tests/wordpress/tests + tests/pytests/functional/cli/test_salt_cloud.py + tests/pytests/functional/cli/test_salt_run_.py + tests/pytests/functional/modules/test_ansiblegate.py + tests/pytests/functional/modules/test_http.py + tests/pytests/functional/modules/test_pip.py + tests/pytests/functional/netapi + tests/pytests/functional/utils/test_etcd_util.py + tests/pytests/functional/utils/test_http.py + tests/pytests/integration/cli/test_salt_proxy.py + tests/pytests/integration/daemons/test_masterapi.py + tests/pytests/integration/modules/state/test_state.py + tests/pytests/integration/modules/state/test_state_state_events.py + tests/pytests/integration/netapi + tests/pytests/integration/pillar/cache/test_pillar_cache.py + tests/pytests/integration/pillar/test_fileclient.py + tests/pytests/integration/pillar/test_pillar_include.py + tests/pytests/integration/proxy/test_simple.py + tests/pytests/integration/runners/state/orchestrate/test_events.py + tests/pytests/integration/wheel/test_pillar_roots.py + tests/pytests/pkg/downgrade/test_salt_downgrade.py + tests/pytests/pkg/integration/test_pip.py + tests/pytests/pkg/integration/test_pip_upgrade.py + tests/pytests/pkg/integration/test_salt_api.py + tests/pytests/pkg/integration/test_salt_call.py + tests/pytests/pkg/integration/test_salt_exec.py + tests/pytests/pkg/integration/test_salt_grains.py + tests/pytests/pkg/integration/test_salt_key.py + tests/pytests/pkg/integration/test_salt_minion.py + tests/pytests/pkg/integration/test_salt_output.py + tests/pytests/pkg/integration/test_salt_pillar.py + tests/pytests/pkg/integration/test_salt_state_file.py + tests/pytests/pkg/integration/test_salt_ufw.py + tests/pytests/pkg/integration/test_salt_user.py + tests/pytests/pkg/integration/test_systemd_config.py + tests/pytests/pkg/integration/test_version.py + tests/pytests/pkg/upgrade/test_salt_upgrade.py + tests/pytests/scenarios/cluster/test_cluster.py + tests/pytests/unit/client/ssh/test_ssh.py + tests/pytests/unit/cloud/clouds/vmware + tests/pytests/unit/loader/test_loading_modules.py + tests/pytests/unit/runners/test_net.py + tests/pytests/unit/states/file/test_mod_beacon.py + tests/pytests/unit/test_client.py + tests/pytests/unit/utils/test_aws.py + tests/pytests/unit/utils/test_http.py + tests/unit/modules/test_boto3_elasticsearch.py + tests/unit/modules/test_boto3_route53.py + tests/unit/modules/test_network.py + tests/unit/modules/test_zcbuildout.py + tests/unit/states/test_zcbuildout.py + + # tests require root access + tests/integration/pillar/test_git_pillar.py + tests/integration/states/test_lxd_container.py + tests/integration/states/test_lxd_image.py + tests/integration/states/test_lxd_profile.py + tests/integration/states/test_supervisord.py + tests/pytests/functional/cache/test_mysql.py + tests/pytests/functional/cli/test_salt.py + tests/pytests/functional/modules/test_mysql.py + tests/pytests/functional/modules/test_vault.py + tests/pytests/functional/states/file/test_accumulated.py + tests/pytests/functional/utils/test_gitfs.py + tests/pytests/functional/utils/test_pillar.py + tests/pytests/scenarios/performance/test_performance.py + tests/pytests/unit/cloud/test_map.py + tests/pytests/unit/engines/test_slack_bolt_engine.py + tests/pytests/unit/modules/state/test_state.py + tests/pytests/unit/modules/state/test_top_file_merge.py + tests/pytests/unit/proxy/test_netmiko_px.py + tests/pytests/unit/proxy/test_ssh_sample.py + tests/pytests/unit/roster/test_sshknownhosts.py + + # tests that require boto + tests/pytests/unit/engines/test_sqs_events.py + + # first test always fails + tests/pytests/unit/utils/parsers/test_log_parsers.py + ) + + rm -r "${remove_test_files[@]}" || die + + # axe the boto dep (bug #888235) + find "${S}/tests" -name 'test_boto_*.py' -delete || die + + # removes contextvars, see bug: https://bugs.gentoo.org/799431 + sed -i '/^contextvars/d' requirements/base.txt || die + + # called_once should be assert_called_once_with + find "${S}/tests" -name '*.py' -print0 \ + | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die + + distutils-r1_python_prepare_all +} + +python_install_all() { + local -x USE_SETUPTOOLS=1 + distutils-r1_python_install_all + + local svc + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + local -a EPYTEST_DESELECT=( + # doesn't like the distutils warning + tests/pytests/integration/cli/test_batch.py::test_batch_retcode + tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch + + # hangs indefinitely + tests/pytests/unit/test_minion.py::test_master_type_disable + + # needs root + tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group + tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert_failure + + # don't like sandbox + tests/integration/modules/test_cp.py::CPModuleTest::test_get_file_str_https + tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_ftp + tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https + tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_dest_empty + tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_no_dest + tests/integration/states/test_git.py::LocalRepoGitTest::test_latest_force_reset_true_fast_forward + tests/pytests/functional/fileserver/test_roots.py::test_symlink_list + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline + tests/pytests/functional/modules/test_defaults.py::test_defaults_get + tests/pytests/functional/modules/test_system.py::test_get_system_date_time + tests/pytests/functional/modules/test_system.py::test_get_system_date_time_utc + tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match + tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd + tests/pytests/functional/states/file/test_append.py::test_issue_1896_file_append_source + tests/pytests/functional/states/file/test_blockreplace.py::test_issue_49043 + tests/pytests/functional/states/file/test_comment.py::test_issue_62121 + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name + tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites + tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls + tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path + tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208 + tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data + tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff + tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case + tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter + tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg + tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd + tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775 + tests/pytests/functional/states/test_pip_state.py::test_22359_pip_installed_unless_does_not_trigger_warnings + tests/pytests/functional/states/test_pip_state.py::test_issue_2028_pip_installed_state + tests/pytests/functional/states/test_pip_state.py::test_issue_54755 + tests/pytests/functional/states/test_pip_state.py::test_pip_installed_errors + tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed + tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed_venv + tests/pytests/functional/states/test_pip_state.py::test_pip_installed_specific_env + tests/pytests/functional/states/test_x509_v2.py::"test_private_key_managed_passphrase_changed_not_overwrite[existing_pk0]" + tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing + tests/pytests/functional/utils/test_pillar.py::test_gitpython_env + tests/pytests/functional/utils/test_pillar.py::test_gitpython_fetch_request + tests/pytests/functional/utils/test_pillar.py::test_gitpython_multiple_repos + tests/pytests/functional/utils/test_pillar.py::test_pygit2_env + tests/pytests/functional/utils/test_pillar.py::test_pygit2_multiple_repos + tests/pytests/functional/utils/test_winrepo.py::test_gitpython_winrepo_simple + tests/pytests/functional/utils/test_winrepo.py::test_pygit2_winrepo_simple + tests/pytests/integration/minion/test_return_retries.py::test_pillar_timeout + tests/pytests/integration/minion/test_return_retries.py::test_publish_retry + tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[False]" + tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[True]" + tests/pytests/integration/modules/test_state.py::test_logging_and_state_output_order + tests/pytests/integration/modules/test_test.py::test_deprecation_warning_emits_deprecation_warnings + tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_call + tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_salt + tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args0-kwargs0]" + tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args1-kwargs1]" + tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args2-kwargs2]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args0-20]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args1-20]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args2-20]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args3-20]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args4-0]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args5-20]" + tests/pytests/integration/ssh/test_jinja_filters.py::test_dateutils_strftime + tests/pytests/integration/ssh/test_terraform.py::test_terraform_roster + tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate + tests/pytests/unit/grains/test_core.py::test_get_machine_id + tests/pytests/unit/grains/test_package.py::test_grain_package_type + tests/pytests/unit/loader/test_loader.py::test_named_loader_context_name_not_packed + tests/pytests/unit/modules/test_beacons.py::test_add + tests/pytests/unit/modules/test_beacons.py::test_add_beacon_module + tests/pytests/unit/modules/test_beacons.py::test_delete + tests/pytests/unit/modules/test_beacons.py::test_delete_beacon_module + tests/pytests/unit/modules/test_beacons.py::test_disable + tests/pytests/unit/modules/test_beacons.py::test_enable + tests/pytests/unit/modules/test_beacons.py::test_enable_beacon_module + tests/pytests/unit/modules/test_beacons.py::test_save + tests/pytests/unit/modules/test_gpg.py::test_create_key_with_passphrase_with_gpg_passphrase_in_pillar + tests/pytests/unit/modules/test_gpg.py::test_create_key_without_passphrase + tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache + tests/pytests/unit/modules/test_saltutil.py::test_list_extmods + tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk + tests/pytests/unit/state/test_state_compiler.py::test_verify_high_too_many_functions_declared_error_message + tests/pytests/unit/states/test_pkg.py::test_mod_beacon + tests/pytests/unit/states/test_service.py::test_mod_beacon + tests/pytests/unit/test_ext_importers.py::test_tornado_import_override + tests/pytests/unit/utils/test_rsax931.py::test_find_libcrypto_darwin_catalina + tests/pytests/unit/utils/test_versions.py::test_warn_until_good_version_argument + tests/unit/transport/test_ipc.py::IPCMessagePubSubCase::test_async_reading_streamclosederror + tests/unit/utils/test_thin.py::SSHThinTestCase::test_thin_dir + tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis + tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode + tests/unit/utils/test_vt.py::VTTestCase::test_vt_size + + # tests that need network access + tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source + tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_architectures + tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_multiple_comps + tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config + tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config_value_none + tests/pytests/unit/test_ext_importers.py::test_tornado_import_override + tests/pytests/unit/utils/test_http.py::test_backends_decode_body_false + tests/pytests/unit/utils/test_http.py::test_backends_decode_body_true + tests/pytests/unit/utils/test_http.py::test_query_proxy + tests/pytests/unit/utils/test_network.py::test_isportopen + + # tests that need root access + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command2 + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_1 + ) + [[ ${EPYTHON#*.} -ge 11 ]] && EPYTEST_DESELECT+=( + tests/unit/test_master.py::TransportMethodsTest::test_aes_funcs_black + tests/unit/test_master.py::TransportMethodsTest::test_clear_funcs_black + ) + [[ ${EPYTHON#*.} -ge 12 ]] && EPYTEST_DESELECT+=( + tests/integration/modules/test_mine.py::MineTest::test_get_allow_tgt + tests/integration/modules/test_mine.py::MineTest::test_mine_delete + tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt + tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt_compound + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall_saltenv + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_run + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_saltenv + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_state + tests/integration/output/test_output.py::OutputReturnTest::test_output_highstate + tests/integration/output/test_output.py::OutputReturnTest::test_output_json + tests/integration/output/test_output.py::OutputReturnTest::test_output_nested + tests/integration/output/test_output.py::OutputReturnTest::test_output_pprint + tests/integration/output/test_output.py::OutputReturnTest::test_output_raw + tests/integration/output/test_output.py::OutputReturnTest::test_output_txt + tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml + tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml_namespaced_dict_wrapper + tests/integration/output/test_output.py::OutputReturnTest::test_static_simple + tests/integration/runners/test_manage.py::ManageTest::test_down + tests/integration/runners/test_manage.py::ManageTest::test_up + tests/integration/shell/test_master_tops.py::MasterTopsTest::test_custom_tops_gets_utilized + tests/integration/states/test_archive.py::ArchiveTest::test_local_archive_extracted_with_skip_files_list_verify_and_keep_source_is_false + tests/pytests/functional/states/test_pip_state.py::test_issue_2087_missing_pip + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[-99.9]" + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[42]" + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value2]" + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value3]" + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value4]" + tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_no_quotes_around_string_it_should_be_returned_as_is + tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_quotes_around_string_they_should_be_removed + tests/pytests/unit/utils/vault/test_auth.py::"test_approle_auth_get_token_login[secret_id-approle]" + tests/unit/modules/test_zypperpkg.py::ZypperTestCase::test_repo_value_info + tests/unit/utils/test_color.py::ColorUtilsTestCase::test_get_colors + ) + + # testsuite likes lots of files + ulimit -n 4096 || die + + # ${T} is too long a path for the tests to work + local TMPDIR + TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die + ( + test_exports=( + TMPDIR + SHELL="/bin/bash" + USE_SETUPTOOLS=1 + NO_INTERNET=1 + PYTHONDONTWRITEBYTECODE=1 + ) + export "${test_exports[@]}" + + cleanup() { rm -rf "${TMPDIR}" || die; } + + trap cleanup EXIT + + addwrite "${TMPDIR}" + + epytest --run-slow + ) +} diff --git a/app-admin/salt/salt-3007.1.ebuild b/app-admin/salt/salt-3007.1.ebuild new file mode 100644 index 000000000000..d8b9533aac5e --- /dev/null +++ b/app-admin/salt/salt-3007.1.ebuild @@ -0,0 +1,611 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_1{0..2} ) + +DISTUTILS_USE_PEP517=setuptools +inherit systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="https://www.saltstack.com/resources/community/ + https://github.com/saltstack" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" +else + inherit pypi + KEYWORDS="~amd64 ~riscv ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE=" + cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako + mongodb neutron nova portage profile redis selinux test raet + +zeromq vim-syntax +" + +RDEPEND=" + sys-apps/pciutils + dev-libs/openssl:0=[-bindist(-)] + dev-python/aiohttp[${PYTHON_USEDEP}] + >=dev-python/cherrypy-18.6.1[${PYTHON_USEDEP}] + >=dev-python/cryptography-42.0.0[${PYTHON_USEDEP}] + >=dev-python/distro-1.5[${PYTHON_USEDEP}] + dev-python/importlib-metadata[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.3[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + dev-python/looseversion[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] + >=dev-python/packaging-21.3[${PYTHON_USEDEP}] + >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.19.1[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-24.0.0[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}] + dev-python/python-gnupg[${PYTHON_USEDEP}] + >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}] + >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}] + >=dev-python/requests-2.31.0[${PYTHON_USEDEP}] + dev-python/setproctitle[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}] + dev-python/tornado[${PYTHON_USEDEP}] + dev-python/watchdog[${PYTHON_USEDEP}] + libcloud? ( + >=dev-python/aiohttp-3.9.0[${PYTHON_USEDEP}] + dev-python/aiosignal[${PYTHON_USEDEP}] + >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}] + dev-python/async-timeout[${PYTHON_USEDEP}] + ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( + dev-python/libvirt-python[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] ) + genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + nova? ( + $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3.1{0..1}) + ) + neutron? ( + $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3.1{0..1}) + ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim ) + zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) +" +BDEPEND=" + sys-apps/findutils + dev-python/build[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + app-arch/zip + dev-python/apache-libcloud[${PYTHON_USEDEP}] + dev-python/boto3[${PYTHON_USEDEP}] + >=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}] + dev-python/cherrypy[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/moto-2.0.0[${PYTHON_USEDEP}] + <dev-python/moto-5[${PYTHON_USEDEP}] + dev-python/passlib[${PYTHON_USEDEP}] + dev-python/bcrypt[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/pygit2[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}] + >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-factories-1.0.0_rc29[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + dev-python/pytest-subtests[${PYTHON_USEDEP}] + dev-python/pytest-shell-utilities[${PYTHON_USEDEP}] + dev-python/pytest-skip-markers[${PYTHON_USEDEP}] + dev-python/pytest-system-statistics[${PYTHON_USEDEP}] + dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + net-dns/bind-tools + >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}] + dev-util/yamllint[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] ) + ) +" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE=" + || ( raet zeromq ) + test? ( cheetah genshi ) + nova? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) + neutron? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) +" +RESTRICT=" + !test? ( test ) + x86? ( test ) +" + +PATCHES=( + "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" +) + +python_prepare_all() { + local -a remove_test_files=( + # remove tests with external dependencies that may not be available, and + # tests that don't work in sandbox + tests/integration/externalapi/test_venafiapi.py + tests/integration/modules/test_rabbitmq.py + tests/integration/modules/test_supervisord.py + tests/integration/states/test_match.py + tests/pytests/functional/fileserver/hgfs/test_hgfs.py + tests/pytests/functional/loader/test_loader.py + tests/pytests/functional/modules/file/test_readlink.py + tests/pytests/functional/modules/file/test_symlink.py + tests/pytests/functional/modules/state/test_jinja_filters.py + tests/pytests/functional/modules/state/test_jinja_renderer.py + tests/pytests/functional/modules/state/test_mako_renderer.py + tests/pytests/functional/modules/state/test_pyobjects_renderer.py + tests/pytests/functional/modules/test_aptpkg.py + tests/pytests/functional/modules/test_dockermod.py + tests/pytests/functional/modules/test_etcd_mod.py + tests/pytests/functional/modules/test_grains.py + tests/pytests/functional/modules/test_mac_service.py + tests/pytests/functional/modules/test_saltcheck.py + tests/pytests/functional/modules/test_saltutil.py + tests/pytests/functional/modules/test_test.py + tests/pytests/functional/pillar/hg_pillar/test_hg_pillar.py + tests/pytests/functional/pillar/test_git_pillar.py + tests/pytests/functional/pillar/test_gpg.py + tests/pytests/functional/returners/test_etcd_return.py + tests/pytests/functional/runners/test_winrepo.py + tests/pytests/functional/sdb/test_etcd_db.py + tests/pytests/functional/state/test_masterless_tops.py + tests/pytests/functional/states/file/test_keyvalue.py + tests/pytests/functional/states/file/test_patch.py + tests/pytests/functional/states/file/test_rename.py + tests/pytests/functional/states/rabbitmq + tests/pytests/functional/states/test_docker_container.py + tests/pytests/functional/states/test_docker_network.py + tests/pytests/functional/states/test_etcd_mod.py + tests/pytests/functional/states/test_module.py + tests/pytests/functional/states/test_mysql.py + tests/pytests/functional/states/test_svn.py + tests/pytests/functional/states/test_virtualenv_mod.py + tests/pytests/functional/test_version.py + tests/pytests/functional/utils/gitfs + tests/pytests/functional/utils/test_vault.py + tests/pytests/integration/cli/test_syndic_eauth.py + tests/pytests/integration/daemons/test_memory_leak.py + tests/pytests/integration/grains/test_grains.py + tests/pytests/integration/master/test_clear_funcs.py + tests/pytests/integration/minion/test_reauth.py + tests/pytests/integration/modules/grains/test_append.py + tests/pytests/integration/modules/grains/test_module.py + tests/pytests/integration/modules/saltutil/test_grains.py + tests/pytests/integration/modules/saltutil/test_modules.py + tests/pytests/integration/modules/saltutil/test_wheel.py + tests/pytests/integration/modules/state/test_state_pillar_errors.py + tests/pytests/integration/modules/state/test_state_test.py + tests/pytests/integration/modules/test_cmdmod.py + tests/pytests/integration/modules/test_event.py + tests/pytests/integration/modules/test_file.py + tests/pytests/integration/modules/test_jinja.py + tests/pytests/integration/modules/test_pillar.py + tests/pytests/integration/modules/test_vault.py + tests/pytests/integration/modules/test_virt.py + tests/pytests/integration/modules/test_x509_v2.py + tests/pytests/integration/proxy/test_deltaproxy.py + tests/pytests/integration/proxy/test_shell.py + tests/pytests/integration/reactor/test_reactor.py + tests/pytests/integration/returners/test_noop_return.py + tests/pytests/integration/runners/state/orchestrate/test_orchestrate.py + tests/pytests/integration/runners/test_cache.py + tests/pytests/integration/runners/test_jobs.py + tests/pytests/integration/runners/test_manage.py + tests/pytests/integration/runners/test_saltutil.py + tests/pytests/integration/runners/test_vault.py + tests/pytests/integration/sdb/test_vault.py + tests/pytests/integration/ssh/state/test_pillar_override.py + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_requisite_fail.py + tests/pytests/integration/ssh/state/test_retcode_pillar_render_exception.py + tests/pytests/integration/ssh/state/test_retcode_render_exception.py + tests/pytests/integration/ssh/state/test_retcode_render_module_exception.py + tests/pytests/integration/ssh/state/test_retcode_run_fail.py + tests/pytests/integration/ssh/state/test_retcode_state_run_remote_exception.py + tests/pytests/integration/ssh/state/test_state.py + tests/pytests/integration/ssh/state/test_with_import_dir.py + tests/pytests/integration/ssh/test_cmdmod.py + tests/pytests/integration/ssh/test_config.py + tests/pytests/integration/ssh/test_cp.py + tests/pytests/integration/ssh/test_deploy.py + tests/pytests/integration/ssh/test_grains.py + tests/pytests/integration/ssh/test_jinja_mods.py + tests/pytests/integration/ssh/test_master.py + tests/pytests/integration/ssh/test_mine.py + tests/pytests/integration/ssh/test_pillar.py + tests/pytests/integration/ssh/test_pillar_compilation.py + tests/pytests/integration/ssh/test_pre_flight.py + tests/pytests/integration/ssh/test_publish.py + tests/pytests/integration/ssh/test_py_versions.py + tests/pytests/integration/ssh/test_raw.py + tests/pytests/integration/ssh/test_saltcheck.py + tests/pytests/integration/ssh/test_slsutil.py + tests/pytests/integration/states/test_beacon.py + tests/pytests/integration/states/test_file.py + tests/pytests/integration/states/test_include.py + tests/pytests/integration/states/test_ini_manage.py + tests/pytests/integration/states/test_state_test.py + tests/pytests/integration/states/test_x509_v2.py + tests/pytests/integration/utils/test_templates.py + tests/pytests/integration/wheel/test_key.py + tests/pytests/pkg/integration/test_check_imports.py + tests/pytests/pkg/integration/test_clean_zmq_teardown.py + tests/pytests/pkg/integration/test_enabled_disabled.py + tests/pytests/pkg/integration/test_help.py + tests/pytests/pkg/integration/test_logrotate_config.py + tests/pytests/pkg/integration/test_pip.py + tests/pytests/pkg/integration/test_pkg.py + tests/pytests/pkg/integration/test_python.py + tests/pytests/scenarios/compat/test_with_versions.py + tests/pytests/unit/loader/test_lazy.py + tests/pytests/unit/modules/test_mongodb.py + tests/pytests/unit/modules/test_mysql.py + tests/pytests/unit/modules/test_schedule.py + tests/pytests/unit/modules/test_yaml.py + tests/pytests/unit/pillar/test_consul_pillar.py + tests/pytests/unit/pillar/test_mysql.py + tests/pytests/unit/pillar/test_pillar.py + tests/pytests/unit/renderers/test_yamlex.py + tests/pytests/unit/roster/test_ansible.py + tests/pytests/unit/roster/test_dir.py + tests/pytests/unit/runners/test_reactor.py + tests/pytests/unit/states/file/test_keyvalue.py + tests/pytests/unit/utils/jinja/test_get_template.py + tests/pytests/unit/utils/jinja/test_salt_cache_loader.py + tests/pytests/unit/utils/test_cache.py + tests/pytests/unit/utils/test_etcd_util.py + tests/pytests/unit/utils/test_package.py + tests/pytests/unit/utils/test_versions.py + tests/pytests/unit/utils/test_x509.py + tests/unit/ext/test_ipaddress.py + tests/unit/modules/test_boto_elb.py + tests/unit/modules/test_boto_secgroup.py + tests/unit/modules/test_boto_vpc.py + tests/unit/modules/test_elasticsearch.py + tests/unit/modules/test_k8s.py + tests/unit/modules/test_kubernetesmod.py + tests/unit/modules/test_vsphere.py + tests/unit/netapi/rest_tornado/test_saltnado.py + tests/unit/states/test_boto_vpc.py + tests/unit/states/test_module.py + tests/unit/test_module_names.py + tests/unit/test_zypp_plugins.py + tests/unit/utils/test_extend.py + tests/unit/utils/test_pbm.py + tests/unit/utils/test_schema.py + tests/unit/utils/test_vmware.py + tests/unit/utils/test_vsan.py + + # tests that require network access + tests/integration/cloud + tests/integration/netapi + tests/pytests/functional/cli/test_salt_cloud.py + tests/pytests/functional/cli/test_salt_run_.py + tests/pytests/functional/modules/test_ansiblegate.py + tests/pytests/functional/modules/test_http.py + tests/pytests/functional/netapi + tests/pytests/functional/states/test_pip_state.py + tests/pytests/functional/utils/test_etcd_util.py + tests/pytests/functional/utils/test_http.py + tests/pytests/integration/cli/test_salt_proxy.py + tests/pytests/integration/daemons/test_masterapi.py + tests/pytests/integration/modules/state/test_state.py + tests/pytests/integration/modules/state/test_state_state_events.py + tests/pytests/integration/netapi + tests/pytests/integration/pillar/cache/test_pillar_cache.py + tests/pytests/integration/pillar/test_fileclient.py + tests/pytests/integration/pillar/test_pillar_include.py + tests/pytests/integration/proxy/test_simple.py + tests/pytests/integration/runners/state/orchestrate/test_events.py + tests/pytests/integration/wheel/test_pillar_roots.py + tests/pytests/pkg/downgrade/test_salt_downgrade.py + tests/pytests/pkg/integration/test_pip_upgrade.py + tests/pytests/pkg/integration/test_salt_api.py + tests/pytests/pkg/integration/test_salt_call.py + tests/pytests/pkg/integration/test_salt_exec.py + tests/pytests/pkg/integration/test_salt_grains.py + tests/pytests/pkg/integration/test_salt_key.py + tests/pytests/pkg/integration/test_salt_minion.py + tests/pytests/pkg/integration/test_salt_output.py + tests/pytests/pkg/integration/test_salt_pillar.py + tests/pytests/pkg/integration/test_salt_state_file.py + tests/pytests/pkg/integration/test_salt_ufw.py + tests/pytests/pkg/integration/test_salt_user.py + tests/pytests/pkg/integration/test_systemd_config.py + tests/pytests/pkg/integration/test_version.py + tests/pytests/pkg/upgrade/test_salt_upgrade.py + tests/pytests/scenarios/cluster/test_cluster.py + tests/pytests/scenarios/dns/multimaster/test_dns.py + tests/pytests/scenarios/dns/test_dns.py + tests/pytests/unit/client/ssh/test_ssh.py + tests/pytests/unit/cloud/clouds/vmware + tests/pytests/unit/loader/test_loading_modules.py + tests/pytests/unit/runners/test_net.py + tests/pytests/unit/states/file/test_mod_beacon.py + tests/pytests/unit/test_client.py + tests/pytests/unit/utils/test_aws.py + tests/pytests/unit/utils/test_http.py + tests/unit/modules/test_boto3_elasticsearch.py + tests/unit/modules/test_boto3_route53.py + tests/unit/modules/test_network.py + tests/unit/modules/test_zcbuildout.py + tests/unit/states/test_zcbuildout.py + + # tests require root access + tests/integration/pillar/test_git_pillar.py + tests/integration/states/test_lxd_container.py + tests/integration/states/test_lxd_image.py + tests/integration/states/test_lxd_profile.py + tests/integration/states/test_supervisord.py + tests/pytests/functional/cache/test_mysql.py + tests/pytests/functional/cli/test_salt.py + tests/pytests/functional/modules/test_mysql.py + tests/pytests/functional/modules/test_vault.py + tests/pytests/functional/states/file/test_accumulated.py + tests/pytests/scenarios/performance/test_performance.py + tests/pytests/unit/cloud/test_map.py + tests/pytests/unit/engines/test_slack_bolt_engine.py + tests/pytests/unit/modules/state/test_state.py + tests/pytests/unit/modules/state/test_top_file_merge.py + tests/pytests/unit/proxy/test_netmiko_px.py + tests/pytests/unit/proxy/test_ssh_sample.py + tests/pytests/unit/roster/test_sshknownhosts.py + + # tests that require boto + tests/pytests/unit/engines/test_sqs_events.py + + # first test always fails + tests/pytests/unit/utils/parsers/test_log_parsers.py + ) + + rm -r "${remove_test_files[@]}" || die + + # axe the boto dep (bug #888235) + find "${S}/tests" -name 'test_boto_*.py' -delete || die + + # removes contextvars, see bug: https://bugs.gentoo.org/799431 + sed -i '/^contextvars/d' requirements/base.txt || die + + # called_once should be assert_called_once_with + find "${S}/tests" -name '*.py' -print0 \ + | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die + + distutils-r1_python_prepare_all +} + +python_install_all() { + local -x USE_SETUPTOOLS=1 + distutils-r1_python_install_all + + local svc + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + local -a EPYTEST_DESELECT=( + # doesn't like the distutils warning + tests/pytests/integration/cli/test_batch.py::test_batch_retcode + tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch + + # hangs indefinitely + tests/pytests/unit/test_minion.py::test_master_type_disable + + # needs root + tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group + tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert_failure + + # don't like sandbox + tests/integration/modules/test_cp.py::CPModuleTest::test_get_file_str_https + tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_ftp + tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https + tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_dest_empty + tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_no_dest + tests/integration/states/test_git.py::LocalRepoGitTest::test_latest_force_reset_true_fast_forward + tests/pytests/functional/fileserver/test_roots.py::test_symlink_list + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline + tests/pytests/functional/modules/test_defaults.py::test_defaults_get + tests/pytests/functional/modules/test_system.py::test_get_system_date_time + tests/pytests/functional/modules/test_system.py::test_get_system_date_time_utc + tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match + tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd + tests/pytests/functional/states/file/test_append.py::test_issue_1896_file_append_source + tests/pytests/functional/states/file/test_blockreplace.py::test_issue_49043 + tests/pytests/functional/states/file/test_comment.py::test_issue_62121 + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name + tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites + tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls + tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path + tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208 + tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data + tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff + tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case + tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter + tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg + tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd + tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775 + tests/pytests/functional/states/test_pip_state.py::test_22359_pip_installed_unless_does_not_trigger_warnings + tests/pytests/functional/states/test_pip_state.py::test_issue_2028_pip_installed_state + tests/pytests/functional/states/test_pip_state.py::test_issue_54755 + tests/pytests/functional/states/test_pip_state.py::test_pip_installed_errors + tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed + tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed_venv + tests/pytests/functional/states/test_pip_state.py::test_pip_installed_specific_env + tests/pytests/functional/states/test_x509_v2.py::"test_private_key_managed_passphrase_changed_not_overwrite[existing_pk0]" + tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing + tests/pytests/functional/utils/test_pillar.py::test_gitpython_env + tests/pytests/functional/utils/test_pillar.py::test_gitpython_fetch_request + tests/pytests/functional/utils/test_pillar.py::test_gitpython_multiple_repos + tests/pytests/functional/utils/test_pillar.py::test_pygit2_env + tests/pytests/functional/utils/test_pillar.py::test_pygit2_multiple_repos + tests/pytests/functional/utils/test_winrepo.py::test_gitpython_winrepo_simple + tests/pytests/functional/utils/test_winrepo.py::test_pygit2_winrepo_simple + tests/pytests/integration/minion/test_return_retries.py::test_pillar_timeout + tests/pytests/integration/minion/test_return_retries.py::test_publish_retry + tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[False]" + tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[True]" + tests/pytests/integration/modules/test_state.py::test_logging_and_state_output_order + tests/pytests/integration/modules/test_test.py::test_deprecation_warning_emits_deprecation_warnings + tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_call + tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_salt + tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args0-kwargs0]" + tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args1-kwargs1]" + tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args2-kwargs2]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args0-20]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args1-20]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args2-20]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args3-20]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args4-0]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args5-20]" + tests/pytests/integration/ssh/test_jinja_filters.py::test_dateutils_strftime + tests/pytests/integration/ssh/test_terraform.py::test_terraform_roster + tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate + tests/pytests/unit/grains/test_core.py::test_get_machine_id + tests/pytests/unit/grains/test_package.py::test_grain_package_type + tests/pytests/unit/loader/test_loader.py::test_named_loader_context_name_not_packed + tests/pytests/unit/modules/test_beacons.py::test_add + tests/pytests/unit/modules/test_beacons.py::test_add_beacon_module + tests/pytests/unit/modules/test_beacons.py::test_delete + tests/pytests/unit/modules/test_beacons.py::test_delete_beacon_module + tests/pytests/unit/modules/test_beacons.py::test_disable + tests/pytests/unit/modules/test_beacons.py::test_enable + tests/pytests/unit/modules/test_beacons.py::test_enable_beacon_module + tests/pytests/unit/modules/test_beacons.py::test_save + tests/pytests/unit/modules/test_gpg.py::test_create_key_with_passphrase_with_gpg_passphrase_in_pillar + tests/pytests/unit/modules/test_gpg.py::test_create_key_without_passphrase + tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache + tests/pytests/unit/modules/test_saltutil.py::test_list_extmods + tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk + tests/pytests/unit/state/test_state_compiler.py::test_verify_high_too_many_functions_declared_error_message + tests/pytests/unit/states/test_pkg.py::test_mod_beacon + tests/pytests/unit/states/test_service.py::test_mod_beacon + tests/pytests/unit/test_ext_importers.py::test_tornado_import_override + tests/pytests/unit/utils/test_rsax931.py::test_find_libcrypto_darwin_catalina + tests/pytests/unit/utils/test_versions.py::test_warn_until_good_version_argument + tests/unit/transport/test_ipc.py::IPCMessagePubSubCase::test_async_reading_streamclosederror + tests/unit/utils/test_thin.py::SSHThinTestCase::test_thin_dir + tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis + tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode + tests/unit/utils/test_vt.py::VTTestCase::test_vt_size + + # tests that need network access + tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source + tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_architectures + tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_multiple_comps + tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config + tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config_value_none + tests/pytests/unit/test_ext_importers.py::test_tornado_import_override + tests/pytests/unit/utils/test_http.py::test_backends_decode_body_false + tests/pytests/unit/utils/test_http.py::test_backends_decode_body_true + tests/pytests/unit/utils/test_http.py::test_query_proxy + tests/pytests/unit/utils/test_network.py::test_isportopen + + # tests that need root access + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command2 + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_1 + ) + [[ ${EPYTHON#*.} -ge 11 ]] && EPYTEST_DESELECT+=( + tests/unit/test_master.py::TransportMethodsTest::test_aes_funcs_black + tests/unit/test_master.py::TransportMethodsTest::test_clear_funcs_black + ) + [[ ${EPYTHON#*.} -ge 12 ]] && EPYTEST_DESELECT+=( + tests/integration/modules/test_mine.py::MineTest::test_get_allow_tgt + tests/integration/modules/test_mine.py::MineTest::test_mine_delete + tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt + tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt_compound + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall_saltenv + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_run + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_saltenv + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_state + tests/integration/output/test_output.py::OutputReturnTest::test_output_highstate + tests/integration/output/test_output.py::OutputReturnTest::test_output_json + tests/integration/output/test_output.py::OutputReturnTest::test_output_nested + tests/integration/output/test_output.py::OutputReturnTest::test_output_pprint + tests/integration/output/test_output.py::OutputReturnTest::test_output_raw + tests/integration/output/test_output.py::OutputReturnTest::test_output_txt + tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml + tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml_namespaced_dict_wrapper + tests/integration/output/test_output.py::OutputReturnTest::test_static_simple + tests/integration/runners/test_manage.py::ManageTest::test_down + tests/integration/runners/test_manage.py::ManageTest::test_up + tests/integration/shell/test_master_tops.py::MasterTopsTest::test_custom_tops_gets_utilized + tests/integration/states/test_archive.py::ArchiveTest::test_local_archive_extracted_with_skip_files_list_verify_and_keep_source_is_false + tests/pytests/functional/states/test_pip_state.py::test_issue_2087_missing_pip + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[-99.9]" + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[42]" + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value2]" + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value3]" + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value4]" + tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_no_quotes_around_string_it_should_be_returned_as_is + tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_quotes_around_string_they_should_be_removed + tests/pytests/unit/utils/vault/test_auth.py::"test_approle_auth_get_token_login[secret_id-approle]" + tests/unit/modules/test_zypperpkg.py::ZypperTestCase::test_repo_value_info + tests/unit/utils/test_color.py::ColorUtilsTestCase::test_get_colors + ) + + # testsuite likes lots of files + ulimit -n 4096 || die + + # ${T} is too long a path for the tests to work + local TMPDIR + TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die + ( + test_exports=( + TMPDIR + SHELL="/bin/bash" + USE_SETUPTOOLS=1 + NO_INTERNET=1 + PYTHONDONTWRITEBYTECODE=1 + ) + export "${test_exports[@]}" + + cleanup() { rm -rf "${TMPDIR}" || die; } + + trap cleanup EXIT + + addwrite "${TMPDIR}" + + epytest --run-slow + ) +} diff --git a/app-admin/serf/Manifest b/app-admin/serf/Manifest index a66d0d5bd131..eeed98dadb74 100644 --- a/app-admin/serf/Manifest +++ b/app-admin/serf/Manifest @@ -1,6 +1,3 @@ -DIST serf-0.10.0-deps.tar.xz 24363004 BLAKE2B f0fed10ffa8ff536263f6fde5a87e9584c35a681e7821a91d123aa8bd149ca1b9024d454f8163de458e4b928e887736c3247661afbc3f46b2ba38bef09d4516d SHA512 73815e512fda8aa00241bff84e1ee2414106a4b1a6189e66aa80967152acafde56eeafd15b87cbaefcbedc093f1c42cfb19b9d5776473c4c580416c2b671931a -DIST serf-0.10.0.tar.gz 446394 BLAKE2B 627e9ee776e217db09dde4bb22d1f317c884f887d918ba69de9bb65160eb00280c1ae5f53119570732f462c35381bd24a81405761b8ec63193295b6245298049 SHA512 53cb42b4a5f94fbb9e099739af0e31bb00cc261ea16325c3e5b9f081bb31299b5b8e42bc92d0f83ae78e511854589a95ab011930f373c1ad148c152b73adf485 DIST serf-0.10.1-deps.tar.xz 24356192 BLAKE2B f635b7f4ea496aeac3148132ff0c4fcd2de037a2fc4c7c0c3943f2531b816a8002eb1e14a2204a30c206630f94400f953ae872e18bd2164c1d688f80961d54b8 SHA512 401e5bb706b3bf6521401ad4d40b02b331e71c6a0886796002046c83dffcffc735b803634d96bff5220d1069f418881daa9432412c4bcf6b7f3b37036d1a3a20 +DIST serf-0.10.1-r1-deps.tar.xz 760452 BLAKE2B 3e2b55d59fd2d94e8cee9082346e827fc1d7ff7d3fb01663d4ae0001a5c29c47212a29c3a98a544dbd4576f157c4c49abea8477c204f96c012b3f4c469724886 SHA512 2a288309d3e5a9486231ddbcd86cee28e950c778dda60247a23692d7e57f0386fdc88e6aff45f5407acd4e604e122f7b010111668340eee1e77f85c80e69803a DIST serf-0.10.1.tar.gz 447396 BLAKE2B a5b1aadf2e7d9b807406d8bd1d2db799f7a629a4db3abb3558c405b7bf81b5bef618157e51887ac631f3b42ca9eab3107ead8ead938ed0a1267299b2c47e0a18 SHA512 50febac6a634b7e19e58a2591371228fe7c1865673f48d082ed57cff1ac9c404d6a3b328d85b82cb92f05973a34396b824fdd9cb81f3e12c586b3f56d6734fa8 -DIST serf-0.9.8-deps.tar.xz 24178272 BLAKE2B 6a82fa025245f0c393b55d87a10195a9ed5f314b3cb772b54b01b858b9f6b393991cc206f269b39efe9a9061aeff948191ae48070eb7c1e5bf77781c97173952 SHA512 ec12d4b27044f58e897984adb3855413e2d3a624f62dffe981353bb5bfbbcbe64501080ef543bc446633716bbfe3ef29c3c93c44db8599b5639e2ef8d20d8eee -DIST serf-0.9.8.tar.gz 444968 BLAKE2B 023413f75444f8e785bd7c5029e84ef58abca1c227f69dd8c16111c30afb38ff331e39cd8c30539f133229829bb9517516ff0e18e49b2dc9fb53df2ed40224b3 SHA512 1501ad6587f77840f7ad95d2886aafa3c28ffa533e862df0ebe5a4822078de09370c2ca1826d47dc6ff84e8598fb3711125a16e399a935ac39bad887e532c402 diff --git a/app-admin/serf/serf-0.10.0.ebuild b/app-admin/serf/serf-0.10.1-r1.ebuild index 540d5af97180..97a6a9dac3d6 100644 --- a/app-admin/serf/serf-0.10.0.ebuild +++ b/app-admin/serf/serf-0.10.1-r1.ebuild @@ -1,25 +1,24 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit go-module systemd -KEYWORDS="~amd64" -EGO_PN="github.com/hashicorp/serf" DESCRIPTION="Service orchestration and management tool" HOMEPAGE="https://www.serfdom.io/" SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" + https://dev.gentoo.org/~zmedico/dist/${PF}-deps.tar.xz" +LICENSE="MPL-2.0" +LICENSE+=" Apache-2.0 BSD MIT" SLOT="0" -LICENSE="MPL-2.0 Apache-2.0 BSD MIT" -IUSE="" +KEYWORDS="~amd64" RESTRICT+=" test" -BDEPEND="" RDEPEND=" acct-user/serf acct-group/serf" +PATCHES=("${S}/go-mod-sum.patch") src_prepare() { default @@ -31,7 +30,7 @@ src_prepare() { src_compile() { mkdir -p ./bin - go build -o ./bin/serf ./cmd/serf || die + ego build -o ./bin/serf ./cmd/serf || die } src_install() { diff --git a/app-admin/serf/serf-0.9.8.ebuild b/app-admin/serf/serf-0.9.8.ebuild deleted file mode 100644 index 540d5af97180..000000000000 --- a/app-admin/serf/serf-0.9.8.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit go-module systemd - -KEYWORDS="~amd64" -EGO_PN="github.com/hashicorp/serf" -DESCRIPTION="Service orchestration and management tool" -HOMEPAGE="https://www.serfdom.io/" -SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" - -SLOT="0" -LICENSE="MPL-2.0 Apache-2.0 BSD MIT" -IUSE="" -RESTRICT+=" test" -BDEPEND="" -RDEPEND=" - acct-user/serf - acct-group/serf" - -src_prepare() { - default - sed -e 's|\(^VERSION[[:space:]]*:=\).*|\1'${PV}'|' \ - -e 's|\(GITSHA[[:space:]]*:=\).*|\1'${PV}'|' \ - -e 's|\(GITBRANCH[[:space:]]*:=\).*|\1'${PV}'|' \ - -i GNUmakefile || die -} - -src_compile() { - mkdir -p ./bin - go build -o ./bin/serf ./cmd/serf || die -} - -src_install() { - local x - - dobin "${S}/bin/${PN}" - - keepdir /etc/serf.d - insinto /etc/serf.d - - for x in /var/{lib,log}/${PN}; do - keepdir "${x}" - fowners serf:serf "${x}" - done - - newinitd "${FILESDIR}/serf.initd" "${PN}" - newconfd "${FILESDIR}/serf.confd" "${PN}" - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - systemd_dounit "${FILESDIR}/serf.service" -} diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest index 2e475c76c75d..dafa5d1085b1 100644 --- a/app-admin/setools/Manifest +++ b/app-admin/setools/Manifest @@ -1,2 +1,2 @@ -DIST setools-4.4.2.tar.bz2 261962 BLAKE2B 7c8e47d8c15f1eb72d93da5d3ae1a64e857ed0a75e1a47bbad9e4b0d11180581d9e4705ebe942e460acbc4d68261f06f9b03a8c4af1516cc388c201e30dca75e SHA512 4e8cba61ca28459387d862136a2d8ee0914c4bcd254a6d39792cbfcbbf7e58cb82223c05d66c114b08aebbd75c11cef11517c51f674ddb3c1913dc85414546c1 DIST setools-4.4.4.tar.bz2 262867 BLAKE2B d64605ef050a2d51531e2a180bff086da536aa8d5e5c8cb96a81e137f575d089f9e9ec117cf0de9864f07174d92258b27ebf8fbc462714ef50bbd6d9f80d0a60 SHA512 ef72a7244ba0c724c4aea3afc40d71427e9c0592715f81cccaa8917e96836a88807ea78039c11c261dd3b4d72294accd76ab4bd37447cd500772030245db3c6e +DIST setools-4.5.1.tar.bz2 264998 BLAKE2B 479cec6f541c1e7125d641928ba49aee949e538612a478840cec2d70106dcf9f7fa5b8049c9d18c560587670ee624a3a744714667d52b99cff24c51e72026db7 SHA512 1045c223423fcb056ffbc2f93c4dc0ccc6ae078ce7d2acbe3a3c65de19440fe801b5b9f71038cde62bf9851f52d868c845aafbe33691ee531cf9854217e061d8 diff --git a/app-admin/setools/files/setools-4.4.1-cython3.patch b/app-admin/setools/files/setools-4.4.1-cython3.patch deleted file mode 100644 index 386b92f44576..000000000000 --- a/app-admin/setools/files/setools-4.4.1-cython3.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://bugs.gentoo.org/898664 -https://github.com/SELinuxProject/setools/pull/105/commits/fc443b5a0379f3644e071a458e996ea6115ccba3 -(cherry-picked from https://github.com/SELinuxProject/setools/commit/31e104c3a9ca97038e09d3a4549fe2b8c8df36e8) - -From fc443b5a0379f3644e071a458e996ea6115ccba3 Mon Sep 17 00:00:00 2001 -From: Chris PeBenito <chpebeni@linux.microsoft.com> -Date: Mon, 17 Jul 2023 16:08:21 -0400 -Subject: [PATCH] SELinuxPolicy: Add explicit cast for libspol message - callback. - -Cython 3.0 is more strict. The change fixes this issue: - -setools/policyrep/selinuxpolicy.pxi:685:46: Cannot assign type 'void (void *, sepol_handle_t *, const char *, ...) except *' to 'msg_callback' - -Additionally, the msg_callback is not typedef-ed in sepol/debug.h, so it must -be explicitly defined in sepol.pxd for the casting to work. - -Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com> ---- a/setools/policyrep/selinuxpolicy.pxi -+++ b/setools/policyrep/selinuxpolicy.pxi -@@ -668,7 +668,7 @@ cdef class SELinuxPolicy: - if self.sh == NULL: - raise MemoryError - -- sepol.sepol_msg_set_callback(self.sh, sepol_logging_callback, self.handle) -+ sepol.sepol_msg_set_callback(self.sh, <sepol.msg_callback>sepol_logging_callback, self.handle) - - if sepol.sepol_policydb_create(&self.handle) < 0: - raise MemoryError ---- a/setools/policyrep/sepol.pxd -+++ b/setools/policyrep/sepol.pxd -@@ -16,8 +16,10 @@ cdef extern from "<sepol/handle.h>": - void sepol_handle_destroy(sepol_handle_t *sh) - - -+ctypedef void (*msg_callback)(void *varg, sepol_handle_t *handle, const char *fmt, ...) -+ -+ - cdef extern from "<sepol/debug.h>": -- ctypedef void (*msg_callback)(void *varg, sepol_handle_t *handle, const char *fmt, ...) - void sepol_msg_set_callback(sepol_handle * handle, msg_callback cb, void *cb_arg) - - diff --git a/app-admin/setools/files/setools-4.5.1-remove-gui.patch b/app-admin/setools/files/setools-4.5.1-remove-gui.patch new file mode 100644 index 000000000000..efb7ae76e490 --- /dev/null +++ b/app-admin/setools/files/setools-4.5.1-remove-gui.patch @@ -0,0 +1,21 @@ +diff --git a/setup.py b/setup.py +index 05aac33..c685791 100644 +--- a/setup.py ++++ b/setup.py +@@ -70,13 +70,10 @@ setup(name='setools', + author='Chris PeBenito', + author_email='pebenito@ieee.org', + url='https://github.com/SELinuxProject/setools', +- packages=['setools', 'setools.checker', 'setools.diff', 'setoolsgui', 'setoolsgui.widgets', +- 'setoolsgui.widgets.criteria', 'setoolsgui.widgets.details', +- 'setoolsgui.widgets.models', 'setoolsgui.widgets.views'], +- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta', 'sechecker'], ++ packages=['setools', 'setools.checker', 'setools.diff'], ++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta', 'sechecker'], + data_files=installed_data, +- package_data={'': ['*.css', '*.html'], +- 'setools': ['perm_map', 'policyrep.pyi', 'py.typed']}, ++ package_data={'setools': ['perm_map', 'policyrep.pyi', 'py.typed']}, + ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'], + annotate=cython_annotate, + compiler_directives={"language_level": 3, diff --git a/app-admin/setools/setools-4.4.2.ebuild b/app-admin/setools/setools-4.5.1.ebuild index a0fdba4cdd9d..0e5f42366899 100644 --- a/app-admin/setools/setools-4.4.2.ebuild +++ b/app-admin/setools/setools-4.5.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 @@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then S="${WORKDIR}/${P}" else SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2" - KEYWORDS="amd64 arm arm64 x86" + KEYWORDS="~amd64 ~arm64 ~riscv" S="${WORKDIR}/${PN}" fi @@ -28,30 +28,29 @@ IUSE="test X" RESTRICT="!test? ( test )" RDEPEND="${PYTHON_DEPS} + >=dev-python/networkx-2.6[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= X? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}] + dev-python/pygraphviz[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}] +BDEPEND=">=dev-python/cython-0.29.14[${PYTHON_USEDEP}] test? ( - >=dev-python/networkx-2.0[${PYTHON_USEDEP}] + dev-python/PyQt6[gui,testlib,widgets,${PYTHON_USEDEP}] + dev-python/pytest-qt[${PYTHON_USEDEP}] sys-apps/checkpolicy )" -PATCHES=( - "${FILESDIR}"/${PN}-4.4.1-cython3.patch -) - distutils_enable_tests pytest python_prepare_all() { sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ die "failed to set lib_dirs" - use X || PATCHES+=( "${FILESDIR}"/setools-4.4.2-remove-gui.patch ) + use X || PATCHES+=( "${FILESDIR}"/setools-4.5.1-remove-gui.patch ) distutils-r1_python_prepare_all } diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild index ec3d11050109..0ce34473cb2a 100644 --- a/app-admin/setools/setools-9999.ebuild +++ b/app-admin/setools/setools-9999.ebuild @@ -28,15 +28,16 @@ IUSE="test X" RESTRICT="!test? ( test )" RDEPEND="${PYTHON_DEPS} - >=dev-python/networkx-2.0[${PYTHON_USEDEP}] + >=dev-python/networkx-2.6[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= X? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}] + dev-python/pygraphviz[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}] +BDEPEND=">=dev-python/cython-0.29.14[${PYTHON_USEDEP}] test? ( sys-apps/checkpolicy )" diff --git a/app-admin/sshguard/sshguard-2.4.3.ebuild b/app-admin/sshguard/sshguard-2.4.3.ebuild index d0bd1ebaa85d..cfb4363a3af3 100644 --- a/app-admin/sshguard/sshguard-2.4.3.ebuild +++ b/app-admin/sshguard/sshguard-2.4.3.ebuild @@ -11,7 +11,7 @@ if [[ "${PV}" == 99999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}" else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" fi diff --git a/app-admin/sshguard/sshguard-99999.ebuild b/app-admin/sshguard/sshguard-99999.ebuild index d2b3282e1a88..5ed4122026b2 100644 --- a/app-admin/sshguard/sshguard-99999.ebuild +++ b/app-admin/sshguard/sshguard-99999.ebuild @@ -11,7 +11,7 @@ if [[ "${PV}" == 99999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}" else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest index 07d6f52021dc..5b130944a5ec 100644 --- a/app-admin/stow/Manifest +++ b/app-admin/stow/Manifest @@ -1,2 +1,4 @@ DIST stow-2.3.1.tar.bz2 556921 BLAKE2B cd946dd1537bec063e21c91cc60c0c8f3a8a5609960536020e7e4b970ff2daa628151258487492b1b44fb5539e1d75a8955152fdfbe91384b7e174ab420a9cf6 SHA512 3d6cec3d50e2dc0ffa92646c45015ced3fca32cef9dd24418fada3fc2e4472a1f335877debb3a1284812aef281a432925c3a3e7afa112d92f127facd3150079c DIST stow-2.3.1.tar.bz2.sig 833 BLAKE2B a236d67fca2dabb965021b7ef23ec680ffd48c1b23d3637cf4bd2c31da58b55ad9d190ee88c7f9bb8ce676f85a0bb133b963bc8252fea7c8d5bd5c0042c65681 SHA512 0a0ad10781c29ee6cd69dc8cb05592e779e5cb53412b8bc6c7bce12846c1e1480e2763eaaab329f2cf945a263d15217adb102387247bc2bec313856b3d7535c4 +DIST stow-2.4.0.tar.bz2 635343 BLAKE2B 578d3cf5084a97110eb90faed96d7ae1b167176795b7c4a3a65d5fc43a59983f5106fbb9d8ea136df92363e041f81c72483cd748cef9e051c2089795af53a6a6 SHA512 c479a0ba5d6af9a2a4860f4bf4095dbd586794e781766c22e6cda657bbf984915f4661e03825db02a300412aa49305e06b8107ffc96077bd64ba4e7a1eb27314 +DIST stow-2.4.0.tar.bz2.sig 833 BLAKE2B df8665e5d8189177138313de95ed1edcd1a38deca753f064cb9e6e1e5447c55467330c4d8f8ffefd05be12528788738e4ecd427db14bf36fdd070161b69a7422 SHA512 02bb9549a1d27c532f7dfbd42d5a6dcd92d0de7692f8e43c74ebd662c63e6cae656edc045379eb81e9908f88ee89100edd8b9fe416e4c13399357579c4836f66 diff --git a/app-admin/stow/stow-2.4.0.ebuild b/app-admin/stow/stow-2.4.0.ebuild new file mode 100644 index 000000000000..99d81a9e7808 --- /dev/null +++ b/app-admin/stow/stow-2.4.0.ebuild @@ -0,0 +1,34 @@ +# 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/adamspiers.asc +inherit perl-functions verify-sig + +DESCRIPTION="GNU Stow is a symlink farm manager" +HOMEPAGE="https://www.gnu.org/software/stow/ https://git.savannah.gnu.org/cgit/stow.git" +SRC_URI="mirror://gnu/stow/${P}.tar.bz2" +SRC_URI+=" verify-sig? ( mirror://gnu/stow/${P}.tar.bz2.sig )" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-lang/perl:=" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( + dev-perl/IO-stringy + virtual/perl-Test-Harness + dev-perl/Test-Output + ) + verify-sig? ( sec-keys/openpgp-keys-adamspiers ) +" + +src_configure() { + perl_set_version + econf "--with-pmdir=${VENDOR_LIB}" +} diff --git a/app-admin/supervisor/supervisor-4.2.5-r1.ebuild b/app-admin/supervisor/supervisor-4.2.5-r1.ebuild new file mode 100644 index 000000000000..065fd0635e6a --- /dev/null +++ b/app-admin/supervisor/supervisor-4.2.5-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( pypy3 python3_{10..12} ) +# xml.etree.ElementTree module required. +PYTHON_REQ_USE="xml(+)" + +inherit distutils-r1 systemd pypi + +DESCRIPTION="A system for controlling process state under UNIX" +HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/" + +LICENSE="repoze ZPL BSD HPND GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~riscv x86" + +# setuptools is required because the package uses pkg_resources +RDEPEND=" + acct-group/supervisor + dev-python/setuptools[${PYTHON_USEDEP}] +" + +distutils_enable_sphinx docs +distutils_enable_tests pytest + +python_install_all() { + distutils-r1_python_install_all + newinitd "${FILESDIR}/init.d-r2" supervisord + newconfd "${FILESDIR}/conf.d-r1" supervisord + dodoc supervisor/skel/sample.conf + keepdir /etc/supervisord.d + insinto /etc + doins "${FILESDIR}/supervisord.conf" + keepdir /var/log/supervisor + systemd_dounit "${FILESDIR}/supervisord.service" +} + +pkg_preinst() { + fowners :supervisor /var/log/supervisor + fperms 750 /var/log/supervisor +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + elog "You may install your configuration files in ${EROOT}/etc/supervisord.d" + elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2" + elog "" + elog "By default, only members of the supervisor group can run supervisorctl." + fi +} diff --git a/app-admin/supervisor/supervisor-4.2.5.ebuild b/app-admin/supervisor/supervisor-4.2.5.ebuild index d067658aa814..4ff555fe8f00 100644 --- a/app-admin/supervisor/supervisor-4.2.5.ebuild +++ b/app-admin/supervisor/supervisor-4.2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/" LICENSE="repoze ZPL BSD HPND GPL-2" SLOT="0" -KEYWORDS="amd64 ~riscv x86" +KEYWORDS="amd64 ~arm64 ~riscv x86" RDEPEND="acct-group/supervisor" diff --git a/app-admin/sxid/Manifest b/app-admin/sxid/Manifest index c35ed083acbb..f7c2153791cc 100644 --- a/app-admin/sxid/Manifest +++ b/app-admin/sxid/Manifest @@ -1 +1,2 @@ DIST sxid-4.2.tar.gz 41827 BLAKE2B c436ffd1b05306508c0ab0e4236cb3968d4456ae0686357a3a2c2a587fdbdaf8e760d5ff8198188c23854b080a91a35fc27a9717ab28f6907deb887a7b455cea SHA512 ed2832a0ffa89a41eba39e116122878b830c46ee7bfb906652606cff61fe16bc28ab6e6b4a802cc2436d9b3a7bdd734a827f007e6f1ce14ca84a9015d3a37a69 +DIST sxid-4.20130802.tar.gz 117411 BLAKE2B 1f3e6ead2bd50c621eb0616afb494139df681e198cb8e5cf98c18f7cb311125e4b61086b0727e2260f223a76e258d2ae34dd87489ae168d1d2913c1520bad591 SHA512 8269808a925ba9a2dcce7400494de5e4c3bd133010faefd0f46b7feafed6fac750b8226f0b3d51edd6ab086caf730ba627a72fba59c8c0aeacf9859019e1cfd5 diff --git a/app-admin/sxid/sxid-4.20130802.ebuild b/app-admin/sxid/sxid-4.20130802.ebuild new file mode 100644 index 000000000000..e776daa7bb8e --- /dev/null +++ b/app-admin/sxid/sxid-4.20130802.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="suid, sgid file and directory checking" +HOMEPAGE="https://linukz.org/sxid.shtml https://github.com/taem/sxid" +SRC_URI="https://linukz.org/download/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="selinux" + +RDEPEND=" + virtual/mailx + selinux? ( sec-policy/selinux-sxid ) +" + +pkg_postinst() { + elog "You will need to configure sxid.conf for your system using the manpage and example" +} diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index 6fa45b03cdb1..4b16f2507837 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -1,6 +1,2 @@ -DIST syslog-ng-4.0.1.tar.gz 5452824 BLAKE2B a5c0328f3c88a38dbc07bb7af2a74c0037a6679525a29fca58620a8ef6b05ec13f3942d26767aded0049376ed30ce6a525686501914648a509997c5de2b48eb4 SHA512 5f83ee3cc4935218feb19f3f5065a68099e3ee291d806ad8810499ded9f9ef3b326b4b22841cd736354ed6a2ebc1ce8ae73f6abe981aa6f64c42da9ee3b1e22f -DIST syslog-ng-4.1.1.tar.gz 5556174 BLAKE2B 3e1a9c394b8a88cc7b39a026950760cbc7796d67b62bb3c0f2970fd80c296e9bd75d1057fe81a0d22ac8488789d13607f19abc6aa38b3a38a30ff450ee66e3a0 SHA512 89abb7a53570b6f7c0dc76905c97d207447117f1db1aa0c0da97c17366ea833b6404f9c7fc318436fd01be2bab032eccca9712063a7c683780026e7e52493dc8 -DIST syslog-ng-4.2.0.tar.gz 5763000 BLAKE2B 7dfa6a1aff896072cc742c6dba5dc1680955e06ce4400fde5b0ddecedd984c039a687f35286685d66e7a5580c7da94f00a14b10f6eb8c162233683bf170e37fb SHA512 85442b57b7934e8afbb4e7d8285ed1fd16aaad2a8d853e3765db4f885d88bee4910a3b5d271f1cbd100c2d3a3f81f1a4fe845bc948fe68c22d32bc9b730af04b -DIST syslog-ng-4.3.1.tar.gz 6091641 BLAKE2B 7cd6b9831d7ad917ee3c7048d3944e9c9f8a100a51a08e4a9e93b117b7ed3725f91097c2e6e9a377c33ab28d92cdb1b3e6ac301d3cf75d84552dcd93e0fe7aa8 SHA512 571f6080765983326ee912f2a7e87cdc8527296ef555a0b16589c04ed332c0db58e24c70251dc39b1c79151ca7d463e6409835df99aa45c19734d7003a69ce61 -DIST syslog-ng-4.4.0.tar.gz 6208437 BLAKE2B 4d719c980f40437661014aa607b01952039694cc1a7e3173efdf1ae682af0e5956098f23009bbbba941c12e26fef515fba0664b170810e654f82f4ae2ac2afc8 SHA512 1cf18c43321e523d0f49b25a4839fd10ec301b207da1b2c407df5167dba557ac0a7781b07f1c1e5d18241376966b8099d9e41dffa55030f6a8052388139c4107 DIST syslog-ng-4.6.0.tar.gz 6671746 BLAKE2B 44efa3efa4e65744318a314adbefc11e7faa68876bca7be7d053262d8effecb80ecd1efc21af653db8e8f2c16496b5a64ea245a8adaa16e845954a13dedfd5c5 SHA512 7c4fbf1ac5377240afa7a1db8d72772399d2c62657fffc3c59e82b2dea6f12031f02320c4f567f981311bd1d8bbfd98962aeb59720ca857867a51b6bf83afb4b +DIST syslog-ng-4.7.1.tar.gz 6877191 BLAKE2B b4a8fa1fe691b96d7e799e57542001829b327a2e8a13237654535ff339a6474bf047408f7fa3939a9e9108d993ebde70fc5d87f4eef9e0d5544ee204aee12a0a SHA512 2f1e0dea4c0ecfc3c77df7e6ac231ee8436c9c78fcb4df8ccdc417fea7d56791fdeb0844ac35f0342ce7c2bea5618d8723b6b54319c556120099eb809873082e diff --git a/app-admin/syslog-ng/syslog-ng-4.0.1.ebuild b/app-admin/syslog-ng/syslog-ng-4.0.1.ebuild deleted file mode 100644 index 4ba1fa54003f..000000000000 --- a/app-admin/syslog-ng/syslog-ng-4.0.1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools python-single-r1 systemd - -MY_PV_MM=$(ver_cut 1-2) -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 http ipv6 json kafka mongodb 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/libpcre-6.1:= - !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:= ) - 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 ) - python? ( ${PYTHON_DEPS} ) - 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 ) - dev-libs/openssl:0=" -DEPEND="${RDEPEND} - test? ( dev-libs/criterion )" -BDEPEND=" - >=sys-devel/bison-3.7.6 - app-alternatives/lex - virtual/pkgconfig" - -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 \ - syslog-ng.conf.gentoo.in; do - sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die - done - - default - eautoreconf -} - -src_configure() { - local myconf=( - --disable-docs - --disable-java - --disable-java-modules - --disable-riemann - --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) - $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) - $(use_enable caps linux-caps) - $(use_enable dbi sql) - $(use_enable geoip2) - $(use_enable http) - $(use_enable ipv6) - $(use_enable json) - $(use_enable kafka) - $(use_enable mongodb) - $(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 -} diff --git a/app-admin/syslog-ng/syslog-ng-4.1.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-4.1.1-r1.ebuild deleted file mode 100644 index e92f8f960cff..000000000000 --- a/app-admin/syslog-ng/syslog-ng-4.1.1-r1.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools python-single-r1 systemd - -MY_PV_MM=$(ver_cut 1-2) -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 http ipv6 json kafka mongodb 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/libpcre-6.1:= - !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:= ) - 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 ) - 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 ) - dev-libs/openssl:0=" -DEPEND="${RDEPEND} - test? ( dev-libs/criterion )" -BDEPEND=" - >=sys-devel/bison-3.7.6 - app-alternatives/lex - virtual/pkgconfig" - -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 \ - syslog-ng.conf.gentoo.in; do - sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die - done - - default - eautoreconf -} - -src_configure() { - local myconf=( - --disable-docs - --disable-java - --disable-java-modules - --disable-riemann - --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) - $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) - $(use_enable caps linux-caps) - $(use_enable dbi sql) - $(use_enable geoip2) - $(use_enable http) - $(use_enable ipv6) - $(use_enable json) - $(use_enable kafka) - $(use_enable mongodb) - $(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 -} diff --git a/app-admin/syslog-ng/syslog-ng-4.1.1-r2.ebuild b/app-admin/syslog-ng/syslog-ng-4.1.1-r2.ebuild deleted file mode 100644 index 48fa3d466610..000000000000 --- a/app-admin/syslog-ng/syslog-ng-4.1.1-r2.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools python-single-r1 systemd - -MY_PV_MM=$(ver_cut 1-2) -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 http ipv6 json kafka mongodb 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/libpcre-6.1:= - !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:= ) - 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 ) - 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 ) - dev-libs/openssl:0=" -DEPEND="${RDEPEND} - test? ( dev-libs/criterion )" -BDEPEND=" - >=sys-devel/bison-3.7.6 - app-alternatives/lex - virtual/pkgconfig" - -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@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in-r1/}" || die - done - - default - eautoreconf -} - -src_configure() { - local myconf=( - --disable-docs - --disable-java - --disable-java-modules - --disable-riemann - --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) - $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) - $(use_enable caps linux-caps) - $(use_enable dbi sql) - $(use_enable geoip2) - $(use_enable http) - $(use_enable ipv6) - $(use_enable json) - $(use_enable kafka) - $(use_enable mongodb) - $(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 -} diff --git a/app-admin/syslog-ng/syslog-ng-4.2.0.ebuild b/app-admin/syslog-ng/syslog-ng-4.2.0.ebuild deleted file mode 100644 index b19189c2836e..000000000000 --- a/app-admin/syslog-ng/syslog-ng-4.2.0.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools python-single-r1 systemd - -MY_PV_MM=$(ver_cut 1-2) -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 http ipv6 json kafka mongodb 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/libpcre-6.1 - 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:= ) - 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 ) - 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" - -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@/${MY_PV_MM}/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-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) - $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) - $(use_enable caps linux-caps) - $(use_enable dbi sql) - $(use_enable geoip2) - $(use_enable http) - $(use_enable ipv6) - $(use_enable json) - $(use_enable kafka) - $(use_enable mongodb) - $(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 -} diff --git a/app-admin/syslog-ng/syslog-ng-4.3.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-4.3.1-r1.ebuild deleted file mode 100644 index 4118e51815de..000000000000 --- a/app-admin/syslog-ng/syslog-ng-4.3.1-r1.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2023 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 http json kafka mongodb 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:= ) - 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 ) - 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" - -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) - $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) - $(use_enable caps linux-caps) - $(use_enable dbi sql) - $(use_enable geoip2) - $(use_enable http) - $(use_enable json) - $(use_enable kafka) - $(use_enable mongodb) - $(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 -} diff --git a/app-admin/syslog-ng/syslog-ng-4.4.0-r1.ebuild b/app-admin/syslog-ng/syslog-ng-4.4.0-r1.ebuild deleted file mode 100644 index 6f66fd33b1b4..000000000000 --- a/app-admin/syslog-ng/syslog-ng-4.4.0-r1.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit autotools 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 http json kafka mongodb 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:= ) - 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 ) - 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" - -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) - $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) - $(use_enable caps linux-caps) - $(use_enable dbi sql) - $(use_enable geoip2) - $(use_enable http) - $(use_enable json) - $(use_enable kafka) - $(use_enable mongodb) - $(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 -} diff --git a/app-admin/syslog-ng/syslog-ng-4.4.0-r2.ebuild b/app-admin/syslog-ng/syslog-ng-4.4.0-r2.ebuild deleted file mode 100644 index 7913301d52da..000000000000 --- a/app-admin/syslog-ng/syslog-ng-4.4.0-r2.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit autotools 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 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 ) - 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) - $(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 -} diff --git a/app-admin/syslog-ng/syslog-ng-4.6.0-r1.ebuild b/app-admin/syslog-ng/syslog-ng-4.6.0-r1.ebuild deleted file mode 100644 index eebbe85eca29..000000000000 --- a/app-admin/syslog-ng/syslog-ng-4.6.0-r1.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit autotools 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 -} diff --git a/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild b/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild index 1404fb49c931..22c7aa4bc2da 100644 --- a/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild +++ b/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild @@ -12,7 +12,7 @@ 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" +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 pacct python redis smtp snmp test spoof-source systemd tcpd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) test? ( python )" diff --git a/app-admin/syslog-ng/syslog-ng-4.4.0-r3.ebuild b/app-admin/syslog-ng/syslog-ng-4.7.1.ebuild index eebbe85eca29..a50e34f09221 100644 --- a/app-admin/syslog-ng/syslog-ng-4.4.0-r3.ebuild +++ b/app-admin/syslog-ng/syslog-ng-4.7.1.ebuild @@ -3,12 +3,12 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) 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" +SRC_URI="https://github.com/syslog-ng/syslog-ng/releases/download/${P}/${P}.tar.gz" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" @@ -21,9 +21,10 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 - >=dev-libs/libpcre2-10.0 + >=dev-libs/libpcre2-10.0:= dev-libs/openssl:0= !dev-libs/eventlog + >=dev-libs/json-c-0.9:= amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) @@ -33,7 +34,6 @@ RDEPEND=" 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 ) diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild index b90a328f094b..24c908b81558 100644 --- a/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild +++ b/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-single-r1 @@ -14,11 +14,8 @@ SRC_URI="https://github.com/dpaleino/syslog-summary/archive/refs/tags/${PV}.tar. LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 ~sparc x86" -IUSE="" - REQUIRED_USE="${PYTHON_REQUIRED_USE}" -DEPEND="" RDEPEND="${PYTHON_DEPS}" PATCHES=( diff --git a/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch b/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch new file mode 100644 index 000000000000..854a66219ff9 --- /dev/null +++ b/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch @@ -0,0 +1,18 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -94,10 +94,14 @@ + endif + + # Compiler flags ++ifndef CPPFLAGS ++CPPFLAGS = @CPPFLAGS@ ++endif ++CPPFLAGS += @DEFS@ + ifndef CFLAGS + CFLAGS = @CFLAGS@ + endif +-CFLAGS += -Wall -Wstrict-prototypes -pipe -O2 ++CFLAGS += $(CPPFLAGS) + + ifndef DFLAGS + DFLAGS = @DFLAGS@ diff --git a/app-admin/sysstat/metadata.xml b/app-admin/sysstat/metadata.xml index b1ea97d19a2d..a5456eab1efa 100644 --- a/app-admin/sysstat/metadata.xml +++ b/app-admin/sysstat/metadata.xml @@ -1,10 +1,7 @@ <?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> + <!-- maintainer-needed --> <upstream> <remote-id type="github">sysstat/sysstat</remote-id> </upstream> diff --git a/app-admin/sysstat/sysstat-12.6.2-r1.ebuild b/app-admin/sysstat/sysstat-12.6.2-r1.ebuild index bb65c56dfae5..6fdcaea03441 100644 --- a/app-admin/sysstat/sysstat-12.6.2-r1.ebuild +++ b/app-admin/sysstat/sysstat-12.6.2-r1.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit systemd toolchain-funcs DESCRIPTION="System performance tools for Linux" -HOMEPAGE="http://sebastien.godard.pagesperso-orange.fr/" +HOMEPAGE="https://sysstat.github.io/" SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" diff --git a/app-admin/sysstat/sysstat-12.6.2-r2.ebuild b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild new file mode 100644 index 000000000000..17f79510f663 --- /dev/null +++ b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd toolchain-funcs + +DESCRIPTION="System performance tools for Linux" +HOMEPAGE="https://sysstat.github.io/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="dcron debug nls lm-sensors selinux systemd" + +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +COMMON_DEPEND=" + nls? ( virtual/libintl ) + lm-sensors? ( sys-apps/lm-sensors:= ) +" + +DEPEND="${COMMON_DEPEND}" + +RDEPEND=" + ${COMMON_DEPEND} + !dcron? ( !sys-process/dcron ) + selinux? ( sec-policy/selinux-sysstat ) +" + +REQUIRED_USE="dcron? ( !systemd )" + +PATCHES=( + "${FILESDIR}"/${PN}-12.6.2-check_overflow.patch + "${FILESDIR}"/${PN}-12.6.2-defs_and_flags.patch +) + +src_prepare() { + if use dcron; then + sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die + fi + default +} + +src_configure() { + tc-export AR + + # --enable-lto only appends -flto + sa_lib_dir=/usr/lib/sa \ + conf_dir=/etc \ + econf \ + $(use_enable !systemd use-crond) \ + $(use_enable lm-sensors sensors) \ + $(use_enable nls) \ + $(usex debug --enable-debuginfo '') \ + --disable-compress-manpg \ + --disable-stripping \ + --disable-pcp \ + --enable-copy-only \ + --enable-documentation \ + --enable-install-cron \ + --with-systemdsystemunitdir=$(systemd_get_systemunitdir) +} + +src_install() { + keepdir /var/log/sa + + emake \ + CHOWN=true \ + DESTDIR="${D}" \ + DOC_DIR=/usr/share/doc/${PF} \ + MANGRPARG='' \ + install + + dodoc -r contrib/ + + newinitd "${FILESDIR}"/${PN}.init.d ${PN} + systemd_dounit ${PN}.service + + rm "${D}"/usr/share/doc/${PF}/COPYING || die +} diff --git a/app-admin/system-config-printer/system-config-printer-1.5.18-r1.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.18-r1.ebuild deleted file mode 100644 index 0c83ac608bfc..000000000000 --- a/app-admin/system-config-printer/system-config-printer-1.5.18-r1.ebuild +++ /dev/null @@ -1,92 +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="xml(+)" -inherit python-single-r1 systemd udev xdg - -DESCRIPTION="Graphical user interface for CUPS administration" -HOMEPAGE="https://github.com/OpenPrinting/system-config-printer" -SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" -IUSE="keyring policykit" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Needs cups running, bug 284005 -RESTRICT="test" - -# Additional unhandled dependencies -# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ? -# python samba client: smbc -# selinux: needed for troubleshooting -COMMON_DEPEND="${PYTHON_DEPS} - dev-libs/glib:2 - net-print/cups[dbus] - virtual/libusb:1 - >=virtual/udev-172 - x11-libs/gtk+:3[introspection] - x11-libs/libnotify[introspection] - x11-libs/pango[introspection] -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.1.2 - >=app-text/xmlto-0.0.22 - dev-perl/XML-Parser - dev-util/desktop-file-utils - >=sys-devel/gettext-0.20 - virtual/pkgconfig -" -RDEPEND="${COMMON_DEPEND} - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pycups[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}] - ') - keyring? ( app-crypt/libsecret[introspection] ) - policykit? ( net-print/cups-pk-helper ) -" - -PATCHES=( "${FILESDIR}/${P}-fix-debugprint-exception.patch" ) # git master (1.5.19) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_configure() { - local myeconfargs=( - --with-xmlto - --enable-nls - --with-desktop-vendor=Gentoo - --with-udev-rules - --with-systemdsystemunitdir=$(systemd_get_systemunitdir) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - default - python_optimize cupshelpers -} - -src_install() { - default - python_fix_shebang "${ED}" - python_optimize - python_domodule cupshelpers -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/app-admin/system-config-printer/system-config-printer-1.5.18-r2.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.18-r2.ebuild index 96a93369f31b..eac1dbdb254b 100644 --- a/app-admin/system-config-printer/system-config-printer-1.5.18-r2.ebuild +++ b/app-admin/system-config-printer/system-config-printer-1.5.18-r2.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" IUSE="keyring policykit" # Needs cups running, bug 284005 RESTRICT="test" diff --git a/app-admin/systemdgenie/metadata.xml b/app-admin/systemdgenie/metadata.xml index 274bd0f534a1..5066380bcf2b 100644 --- a/app-admin/systemdgenie/metadata.xml +++ b/app-admin/systemdgenie/metadata.xml @@ -13,5 +13,6 @@ <email>rthomsen6@gmail.com</email> <name>Ragnar Thomsen</name> </maintainer> + <remote-id type="kde-invent">system/systemdgenie</remote-id> </upstream> </pkgmetadata> diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest index c84687c110fe..d6803b0b86ce 100644 --- a/app-admin/terraform/Manifest +++ b/app-admin/terraform/Manifest @@ -1,8 +1,4 @@ -DIST terraform-1.3.9-deps.tar.xz 246904620 BLAKE2B 26577614ff95fa03dcf0362050f0e2a10eaa500f71d992b2927f6c44475341e899f62141e203ce9231bf329dc03825076d3f615c693a6c33c11190d4420b042f SHA512 9587b6022d320a104f3ad67dda9f1b931e258f78e7f6b6f87a8302732206b55d7d4af555b09517994ea1f53f069d8e1b5e2ca05c129efbbe4d7c3b75cbd27c69 -DIST terraform-1.3.9.tar.gz 4964672 BLAKE2B bfe823a2c1bc8d6188d339c8b5d452be4873adf1063aa0a880457d7e5b4e042d2d8c2ba93eb20eb46bad209c184bfe628b5093d6bdd6163e1bc57934c6770ad2 SHA512 3e951142120b5d71830b5bde34ef3e8907b1585f461f51f83e16170a46e1fc21934d4d1935f1a49963add3d894f68a5cf267ef91293347d0dd9a4b90978ea751 -DIST terraform-1.6.5-deps.tar.xz 334283548 BLAKE2B 6222db5b66d9a49a7dba4806a1f5a07e0c7a871077bf960f556bcb55661957e41f4688babdd0f826a1a5b837520f98387de218fb8c90b7a902dda0f05566536d SHA512 dbbc303282ac918441a4018ceed6c6c448137f126a9125c322514a3336f27d6c312060c39d0d60a132caad2540be5bc274d7b30206b1df72af3e795bb140aab8 -DIST terraform-1.6.5.tar.gz 5635461 BLAKE2B afa99bf8e9787a4498e9868ceb91921e6be7bdd5d7ef60378a9173e9765f689fb4c6e8888ce5405c00a6fe855e22dc91fc46e911be8bbc1f0665d9f11bed1ebf SHA512 588b00bc86905021d5efb41ba62306c2a41c9cd2225fb1aeb956a7845be15d6aa3c7d0365e3b779ea7da415a562094ba091e6a4644add72ba3abe169f3a7d36a -DIST terraform-1.7.0-deps.tar.xz 334327044 BLAKE2B 0f83b190af69766fde3c1906fd291f5d70fc9a2ee30ca4e61e5938b51dfca3a6cb942612fa97a4ea124b0fb4fdd6e4820cf314dd653419c7154e2d9e5e21be0d SHA512 80ecbdf3fe43e5eee25f774be47b01532d5f144d8564dc18443a501683fc2a10482682e983add24f1754bf02469035e7d5b0fd29378d3c851998e81c69eb45be -DIST terraform-1.7.0.tar.gz 6132499 BLAKE2B 15c7e47a193643aa57d4b11e92ad7f479cd7397efb389bf63413ee11e755233f0d2fd5434d151f180892e018f708f0110678818bb5d8900b25ed62684b8ef21d SHA512 02b121ed9db658ef7623bf4d2725a593b735153ab0dab6964416cdd109273b4d749bc74a4f1edf64258227dab3a8eb4ddb5fe3868b7964acc93bcd126c5fe1c5 -DIST terraform-1.7.2-deps.tar.xz 334339964 BLAKE2B 1f1e8b41dd164bb92271d8a29a8ec31a9aa34272c3ce8530518b0a2fdc1706a97581f6096b8bc564aa1291e6c53c1a5833a32af841fcc410b0c9880412a5edee SHA512 f8979165039a1c928a5de4759b96155b1c76ffa9ff5dd21081007f0b695f52b035d6cc8925cddfa20da3e252120642b2e58db3b76c47b4ccc845022440ac550b -DIST terraform-1.7.2.tar.gz 6135908 BLAKE2B 252fbc41171a00c5077d7f07af25d912507215d1dd51be2c73b79a185a60c2eb486e5dd6ffd55bce06e1d2996b908930b5dc3cd73069fe78f7ac2e75cf144c26 SHA512 e9843cfa4a1f830fac10908257d05d08a6490edd9caeb8b83b45a6d1d282f98b6db0d07a4b2bc12439a76c0eb6a0bd0ab343a30cd92de6670c1ad9473d51c6d1 +DIST terraform-1.8.4-deps.tar.xz 107840308 BLAKE2B 414f8e4bb6c72aa8bb0d5ed040c49c572aac0a50932f2ca3c0eddc6973f5fd21775c2db394d21628bd7bd302900fb28f4713ecf9835b5bce40c15ec6fb34bf4b SHA512 3491fc9e789444882acfcc4a8374cb3e49f6fe128d66f53339145b7fa6b75e73c8d5d294ee03b0e96af746dc0cbc6c2e0bce1d149df1c881c686000431b22428 +DIST terraform-1.8.4.tar.gz 6307332 BLAKE2B d26d62e4e99bf0e0b23277c7343e6da0281bb3b9bdfbe6b74277bc6a2ef9b8cb2e374b204ecdd933819a5576bde44115998ac030d7b801d8dd40a390d9df40dd SHA512 0babc6400a8e49ebcc734cf7ff4377ae91fb90f1e77b56e8fdc288203e1708b8f7c5c16e4aa64a720ab4b4c191959d0cfdfda1aa3514c36e806c8d5b7f65b663 +DIST terraform-1.9.1-deps.tar.xz 108273656 BLAKE2B 6bad479e0217eeafcb5f7c75926d1dcdc50873f34d194d4829a1277a06ab81a4ff4f5945ab8ba628f40475fc93e9375a165e08f99b4bc685f3d150cfbddc0a71 SHA512 0016d5bd19a34032daf58cbb8d42ba3a2209cb295f6e20c484f45b70daf3283dd2de213446ec7cc088df24ce1d825b4ab8c064b2162739356f815cab7b61cbb2 +DIST terraform-1.9.1.tar.gz 6563160 BLAKE2B 3f9d8992ca15ddd0fe225fbdb6dc194dcc42dd1700edf739f80b4fe1aef5dcdbbb560a525f0f5564562d0e299cbabbf542c54d49160fb1c8ff674421200f39de SHA512 bbc4d03807f714902300e0a461653c137cebdcaadca879da8834fc232955d2f700711541641f05337946c755e9963010034998bff76a84aa1ac65fa6ae6871ec diff --git a/app-admin/terraform/terraform-1.7.0.ebuild b/app-admin/terraform/terraform-1.8.4.ebuild index d8faa6d78fd0..78692f4a1150 100644 --- a/app-admin/terraform/terraform-1.7.0.ebuild +++ b/app-admin/terraform/terraform-1.8.4.ebuild @@ -11,9 +11,10 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" LICENSE="BUSL-1.1" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv" +KEYWORDS="amd64 ~arm64 ~riscv" -BDEPEND="dev-go/gox" +BDEPEND="dev-go/gox + >=dev-lang/go-1.21.5" RESTRICT="test" diff --git a/app-admin/terraform/terraform-1.7.2.ebuild b/app-admin/terraform/terraform-1.9.1.ebuild index 6366b8f6f5db..6366b8f6f5db 100644 --- a/app-admin/terraform/terraform-1.7.2.ebuild +++ b/app-admin/terraform/terraform-1.9.1.ebuild diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest index eb6decb01775..bef94bf92ce7 100644 --- a/app-admin/testdisk/Manifest +++ b/app-admin/testdisk/Manifest @@ -1 +1 @@ -DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5 +DIST testdisk-7.2.tar.bz2 855781 BLAKE2B 224fae052fa9264ee83fdf6804159c77257b9db4c96ff36c7cb1dc184ec4a9f0955f0d817de24ef1e5fe69e7ef1a20c140e73fc130fb092e6df3b02df2845239 SHA512 f99dd1c8f547c3d06e5459ba072438192a49d76c569de7915994beb269645092522d8136a212999382f88ca1d29c50f6482306d47197dc0994d168bcd4141f26 diff --git a/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch b/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch deleted file mode 100644 index 4ef379f0021f..000000000000 --- a/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2b0a0fcde875a89e2beffbe5c43c7518f682b482 Mon Sep 17 00:00:00 2001 -From: Christophe Grenier <grenier@cgsecurity.org> -Date: Wed, 6 Apr 2022 07:43:45 +0200 -Subject: [PATCH] src/ntfs_io.c: fix ntfs_device_testdisk_io_ioctl() prototype - for ntfs-3g - ---- -Gentoo note: link to upstream commit: -https://git.cgsecurity.org/cgit/testdisk/commit/?id=2b0a0fcde875a89e2beffbe5c43c7518f682b482 - - src/ntfs_io.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/ntfs_io.c b/src/ntfs_io.c -index 5ca494a5..fa056724 100644 ---- a/src/ntfs_io.c -+++ b/src/ntfs_io.c -@@ -159,6 +159,7 @@ static int ntfs_device_testdisk_io_stat(struct ntfs_device *dev, struct stat *bu - return -1; - } - -+#ifdef HAVE_LIBNTFS - static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request, - void *argp) - { -@@ -168,6 +169,17 @@ static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request, - #endif - return -1; - } -+#else -+static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, unsigned long request, -+ void *argp) -+{ -+ log_warning( "ntfs_device_testdisk_io_ioctl() unimplemented\n"); -+#ifdef ENOTSUP -+ errno = ENOTSUP; -+#endif -+ return -1; -+} -+#endif - - /** - * Device operations for working with unix style devices and files. --- -2.37.4 - diff --git a/app-admin/testdisk/files/testdisk-7.2-musl.patch b/app-admin/testdisk/files/testdisk-7.2-musl.patch new file mode 100644 index 000000000000..d01c2797bf28 --- /dev/null +++ b/app-admin/testdisk/files/testdisk-7.2-musl.patch @@ -0,0 +1,25 @@ +From 2c6780ca1edd0b0ba2e5e86b12634e3cc8475872 Mon Sep 17 00:00:00 2001 +From: Christophe Grenier <grenier@cgsecurity.org> +Date: Tue, 14 May 2024 17:34:56 +0200 +Subject: [PATCH] src/hdaccess.c: Fix build with musl-1.2.5 See + https://github.com/cgsecurity/testdisk/issues/154 + https://bugs.gentoo.org/931887 + +--- + src/hdaccess.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/hdaccess.c b/src/hdaccess.c +index 91ec7915..9768c07c 100644 +--- a/src/hdaccess.c ++++ b/src/hdaccess.c +@@ -109,6 +109,9 @@ + #ifdef HAVE_GLOB_H + #include <glob.h> + #endif ++#ifdef HAVE_LIBGEN_H ++#include <libgen.h> ++#endif + + #if defined(__CYGWIN__) || defined(__MINGW32__) + #include "win32.h" diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml index adbd9697dcd6..0cde64481bdc 100644 --- a/app-admin/testdisk/metadata.xml +++ b/app-admin/testdisk/metadata.xml @@ -13,6 +13,7 @@ <flag name="ntfs">Include the ability to read NTFS filesystems</flag> <flag name="reiserfs">Include reiserfs reading ability</flag> <flag name="ewf">Include ewf library</flag> + <flag name="sudo">Enable sudo helper integration</flag> </use> <upstream> <remote-id type="github">cgsecurity/testdisk</remote-id> diff --git a/app-admin/testdisk/testdisk-7.1-r2.ebuild b/app-admin/testdisk/testdisk-7.2.ebuild index 100c4ccc7787..cfc23c0f8bc4 100644 --- a/app-admin/testdisk/testdisk-7.1-r2.ebuild +++ b/app-admin/testdisk/testdisk-7.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,13 +12,19 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" -IUSE="ewf jpeg ntfs gui reiserfs static zlib" +IUSE="ewf jpeg ntfs gui reiserfs static +sudo zlib" REQUIRED_USE="static? ( !gui )" +QA_CONFIG_IMPL_DECL_SKIP=( + 'ntfs_mbstoucs' # configure script checking NTFS, has fallbacks +) + # WARNING: reiserfs support does NOT work with reiserfsprogs # you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released). +# sudo is detected during configure for extra functionality, see bug #892904 DEPEND=" + sudo? ( app-admin/sudo ) static? ( sys-apps/util-linux[static-libs] sys-fs/e2fsprogs[static-libs] @@ -45,13 +51,17 @@ DEPEND=" !arm? ( ewf? ( app-forensics/libewf:= ) ) ) " -RDEPEND="!static? ( ${DEPEND} )" +RDEPEND=" + sudo? ( app-admin/sudo ) + !static? ( ${DEPEND} ) +" BDEPEND="gui? ( dev-qt/linguist-tools:5 )" DOCS=() PATCHES=( - "${FILESDIR}"/${P}-backport-ntfs-3g-ioctl-prototype.patch + # https://github.com/cgsecurity/testdisk/commit/2c6780ca1edd0b0ba2e5e86b12634e3cc8475872 + "${FILESDIR}/${P}-musl.patch" ) src_configure() { @@ -59,12 +69,12 @@ src_configure() { export PATH="$(qt5_get_bindir):${PATH}" local myconf=( - --enable-sudo - --without-ntfs + --without-ntfs # old NTFS implementation, use ntfs-3g instead. $(use_with ewf) $(use_with jpeg) $(use_with ntfs ntfs3g) $(use_enable gui qt) + $(use_enable sudo) $(use_with reiserfs) $(use_with zlib) ) diff --git a/app-admin/ttyplot/Manifest b/app-admin/ttyplot/Manifest index 108e1ef82876..57ac35fac801 100644 --- a/app-admin/ttyplot/Manifest +++ b/app-admin/ttyplot/Manifest @@ -1,4 +1,3 @@ -DIST ttyplot-1.5.1.gh.tar.gz 43629 BLAKE2B 98c46c27587a6ed98f7ed146b402dcbb6f5835f2f34780ccd706dc56b674dec3792dfb8bf84c8d260c040952ef0431341df09c16d032f32d4621c5f3971857d7 SHA512 3eb255375366bc3a773364388dc709f4f5b9961e1c99404dfd192503b20a8eb064f5089811b8c894a8214f84d24e14d040adb0b34712915311eb28972586bf0b -DIST ttyplot-1.5.2.gh.tar.gz 44023 BLAKE2B a8ebf0529f1d3e65ec5887d0fc45c51840ddb26ed982ea5bc2e47d66c03878a642576c7b3052c717f296af9b3fe0fca15080cbf252cb274238e6b664372f219e SHA512 ffdeba5d1ad4a0abbb04d76d914a2f209471ac6f601447c4693de594b0cdb1c162e42b49bb1bf0bb50e2d9b0d9b0452fb9f3d8949c5b9143cc9b6faae50ad28f -DIST ttyplot-1.6.1.gh.tar.gz 53746 BLAKE2B f78c5b7ef53e0bd1921138db965edcb9aff95d359263f1343ad2f33b075ff49ef0147354a7467de8cc5cc3a1f2508f9cf81fcbc6195c600d1fd07d0760de9b42 SHA512 cb21b28c86e1364536bdd417a99fa952a8c46623dbca5e6da31bf34763415fa7fcf0ecd6d02a8fc355a483ba64883412d4b448c2cdc1e397b81195c9fb1beffa DIST ttyplot-1.6.2.gh.tar.gz 56277 BLAKE2B c7a818a69774fc7c5f6b498e5bf2f9c3ec644dc23d54daf59adaf13962f614c23918ca1d84614e27c60e75d1b98b3eb3c548dc14b59b539acceb3327dafabe0c SHA512 7ede447667a0a8f4b164a2a409e1264c36c95c22eeeda348c894678cb8d7209e742bb90f48a8a5260dd457ae7ff0a090a7d8b7eb25b20e20ada575e00cc4eb0b +DIST ttyplot-1.6.4.gh.tar.gz 56541 BLAKE2B b05fffd2a7903ec94d516c7e970db4dd2dd90ac2568c6c3e3b6608e40ab65a18ac6a9a9693e189328bfebdd120fb50efd8bedcb260329d5ad28d0c7a81c390dd SHA512 51d8cc7dfa281f66e92b0f508f9db413869bb559aa6d1f4a54eb658f3564e2552b622e8667587bbe9e7c85063b03704a03e8eb004b979c68bf874453b5c3cbb5 +DIST ttyplot-1.6.5.gh.tar.gz 56538 BLAKE2B 1119012b170cde84b904f34c3bcf7d7c3e1adbf1ae5a465dffb74be11ad073251c40c508d4ced7f36db6a3e96336e04c61e0f402bb5f0d7ee6c5ca8e9451d900 SHA512 93512777f0371857cadb43a836538cb9e946b7110157534c9c76c090852ea5c9ee6085742f9c6d501f8c7a62f05967309e24e1a3bad96eac4b726f946053b0ab diff --git a/app-admin/ttyplot/ttyplot-1.5.1.ebuild b/app-admin/ttyplot/ttyplot-1.5.1.ebuild deleted file mode 100644 index 31b1533c83eb..000000000000 --- a/app-admin/ttyplot/ttyplot-1.5.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -DESCRIPTION="Realtime plotting utility with data input from stdin" -HOMEPAGE="https://github.com/tenox7/ttyplot" -SRC_URI="https://github.com/tenox7/ttyplot/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="sys-libs/ncurses" -RDEPEND="${DEPEND}" - -src_install() { - local args=( - PREFIX=/usr - MANPREFIX=/usr/share/man - DESTDIR="${D}" - ) - emake "${args[@]}" install -} diff --git a/app-admin/ttyplot/ttyplot-1.5.2.ebuild b/app-admin/ttyplot/ttyplot-1.5.2.ebuild deleted file mode 100644 index 31b1533c83eb..000000000000 --- a/app-admin/ttyplot/ttyplot-1.5.2.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -DESCRIPTION="Realtime plotting utility with data input from stdin" -HOMEPAGE="https://github.com/tenox7/ttyplot" -SRC_URI="https://github.com/tenox7/ttyplot/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="sys-libs/ncurses" -RDEPEND="${DEPEND}" - -src_install() { - local args=( - PREFIX=/usr - MANPREFIX=/usr/share/man - DESTDIR="${D}" - ) - emake "${args[@]}" install -} diff --git a/app-admin/ttyplot/ttyplot-1.6.2.ebuild b/app-admin/ttyplot/ttyplot-1.6.4.ebuild index 1d6a43c8b979..a0e31d253379 100644 --- a/app-admin/ttyplot/ttyplot-1.6.2.ebuild +++ b/app-admin/ttyplot/ttyplot-1.6.4.ebuild @@ -3,6 +3,8 @@ EAPI="8" +inherit toolchain-funcs + DESCRIPTION="Realtime plotting utility with data input from stdin" HOMEPAGE="https://github.com/tenox7/ttyplot" SRC_URI="https://github.com/tenox7/ttyplot/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" @@ -15,6 +17,10 @@ RDEPEND="virtual/pkgconfig" DEPEND="${RDEPEND} sys-libs/ncurses[tinfo]" +src_compile() { + emake CC="$(tc-getCC)" +} + src_install() { local args=( PREFIX=/usr diff --git a/app-admin/ttyplot/ttyplot-1.6.1.ebuild b/app-admin/ttyplot/ttyplot-1.6.5.ebuild index b2ae208ee667..a0e31d253379 100644 --- a/app-admin/ttyplot/ttyplot-1.6.1.ebuild +++ b/app-admin/ttyplot/ttyplot-1.6.5.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" +inherit toolchain-funcs + DESCRIPTION="Realtime plotting utility with data input from stdin" HOMEPAGE="https://github.com/tenox7/ttyplot" SRC_URI="https://github.com/tenox7/ttyplot/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" @@ -15,6 +17,10 @@ RDEPEND="virtual/pkgconfig" DEPEND="${RDEPEND} sys-libs/ncurses[tinfo]" +src_compile() { + emake CC="$(tc-getCC)" +} + src_install() { local args=( PREFIX=/usr diff --git a/app-admin/ulogd/files/ulogd.logrotate b/app-admin/ulogd/files/ulogd.logrotate index 777e40097a5e..b5a48a78674d 100644 --- a/app-admin/ulogd/files/ulogd.logrotate +++ b/app-admin/ulogd/files/ulogd.logrotate @@ -2,7 +2,7 @@ sharedscripts missingok notifempty - create 0640 ulogd + create 0640 ulogd ulogd postrotate [ -f /run/ulogd.pid ] && /bin/kill -HUP $(cat /run/ulogd.pid) endscript diff --git a/app-admin/ulogd/ulogd-2.0.8.ebuild b/app-admin/ulogd/ulogd-2.0.8-r1.ebuild index 3768bedeb734..df0c534c008a 100644 --- a/app-admin/ulogd/ulogd-2.0.8.ebuild +++ b/app-admin/ulogd/ulogd-2.0.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/app-admin/usbview/usbview-3.1.ebuild b/app-admin/usbview/usbview-3.1.ebuild index 84120651b862..0a78c3e5780f 100644 --- a/app-admin/usbview/usbview-3.1.ebuild +++ b/app-admin/usbview/usbview-3.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86" RDEPEND=" dev-libs/glib:2 diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest index ed9fdd0f316c..8eb33f53ee11 100644 --- a/app-admin/vault/Manifest +++ b/app-admin/vault/Manifest @@ -1,6 +1,10 @@ DIST vault-1.14.5-vendor.tar.gz 71839384 BLAKE2B 845416db5d69c400d5e9603bd42b2d73112b1cea884a03ac1345afad627b0d8ed0ff983d97b3086ed69462713cc706aa67f46164df4c1e4e3226aafb66cf0e89 SHA512 ac55e4f9b76ac80eb0f82e5d63ed234c65a9b5c737fcb6f7ad8c9cb9dbe303b6d18a11b329f8223d9fbdcea1a7ee982c622184537fce45fe005df89b8392bbe5 DIST vault-1.14.5-webui.tar.xz 1670796 BLAKE2B 8629de337f2c708553752409a1c8ddc94e421adb34c7b31116f4154e06eed6e7ffb0355cd7ff91d7ec42f1fb1a35737732d530a8587cf515a0636b0a5dbffb38 SHA512 32ff0d720282f0539288f3ee111b91d43b9098bd4ea309d11f638c9f0c4a0a9276fe2f940573d9d664dcea33945f08ac33488ad05d37b372042e859b6d2f7e97 -DIST vault-1.14.8-vendor.tar.gz 71869146 BLAKE2B 5875056d5ec53396ed53db7fd4891a6fbc3c5449a3f2409e11a409ed00cca2c0741e755a31c9d9c1b777c52a0b136cfc30be498a9321e9a0ff317b82e4c35d0e SHA512 e02c6fa1f09ccbb53420dc3919151a5783c4b861c8601ff5079db03a4be926d00a3a963130942f629dda8178275728ddfdcb537f1188e2279c67733883a0178c -DIST vault-1.14.8-webui.tar.xz 1680312 BLAKE2B c698adc325633b1dc59dea3b09692da0476a5f3dbd1f69f1e68243fa903e4590b152846f2dabd4b7f5f492467fcdc52c0afd82bfe1a956b1b69f11da403fab9c SHA512 a25faa74614b31688bb91c4ac2b6a105426be632cc417e94ef14c60a388f076eaec006e07a9784047422b70ce9d9c9fd33e6fb8ef3595b7f1a6468739da8e1c6 DIST vault-1.14.9-vendor.tar.gz 71845081 BLAKE2B ea25a6ba8ac293971170688b4ce3845ba19a5af746c3d96860420d74f8c0af33ea118a47d17117dbd520675739c44ed76118ef126c5b53e4c4adb0924cda58d5 SHA512 00ff45f986889d17ebe59c27aeaf8132270e5f06883bf84ce10721c9e2943a25ad8b86be3271991c824369ad5545258b3c01600f1dda06487751ff806b1d76b9 DIST vault-1.14.9-webui.tar.xz 1677212 BLAKE2B db4da051a8c0a62e99c1f2070f3c022fc934350b255d21b360b3b3b53555942f1ac6c4ef15ed7d8a2519f05752406add63837317615afb387b0fc407f5ab8410 SHA512 2f54dd24fb9a4e2e774dd4212a605126a9d4e4975a97a01c88c94bce8e6f10174fe07235d402dd43ae31aacf4371f77272e4446d972d2e7304745186b0e6dbb7 +DIST vault-1.15.6-deps.tar.xz 20736608 BLAKE2B 53e21d0664f9bbd8c851a486334e04d3b3151aaee709c8fe88ab4969a81ebd4562cf3a350e383647140bd4826a0aa75b34ef136c81920b868dff7ae6f0522e37 SHA512 c1c24c2c646a441c551849af2d3165fc15db2b61f261608f44b7371214cdef0e76263b5b2f295c19606057e80316b4864fff64bc5603b99901fc8a5d900c6550 +DIST vault-1.15.6-webui.tar.xz 1721320 BLAKE2B 3f2d31767c6086e7b17f7445f0cff34ce4ebd7a6a1daeaede96443758096a6b8b94b971af5a74e8bcfb2c95c07b496b1babf3f8ce82f9b360fafe5a4d5138cac SHA512 6a532258a5c7734863967926d95699b2611959177b9dbf4e60cff115331237e65f3dbc41e842443ee5af9020c69280b27a511f887528dc914f9d9e642f9a3a63 +DIST vault-1.15.6.tar.gz 31923253 BLAKE2B 8a4e7b9d8d6753b6f717c6699b2d4822cecff299e3cebd8945d3c34232ff77611611d4e6259ab9c9c4ff91a2e52b7eef707df7da68960be36c314ceba18b124b SHA512 52be0e47f3028f9c1f3ce5d2a72356c955f20fcaf6e8396a6d5938226d72cd8353bed398ba66a6821fc609aaed465e82c3449aeaa0dfaabe80ff0412a73779b3 +DIST vault-1.16.1-deps.tar.xz 21476528 BLAKE2B 2ba0bd2165ce41bfae6fb56a0ff97fe4ed30ac5e16f30ceba14d618e30851b9bb31a964cf5035cd4089baf87c2cda5acd17558bb363acbbcc371ddf47b453c73 SHA512 a0262f421eacfc729a0bc98c137a580d3ca7b384b5b7a8e3bb81cc27b0791b81fdb9005ff9721159cccaf49f2ec6e86dafe7f4e2dde4b5c8d806a8bf1c68de2c +DIST vault-1.16.1-webui.tar.xz 2213524 BLAKE2B 40c0811c84c849beba934f110afa21fe1ebe60f9a01750fcb4c6442f6a8ef28babd4c32157e6bb3eaf7545b683a81122f445a1a0d717cf7442a678e87206f67a SHA512 ca25ffaa85445070310fad9d5a05d6ff477729d64707a4da8bc433781d7f2283e18e680a9a06d6aa37496a21b148ac3bdc5eb3f475246ee3fe3cf4a8db096ffb +DIST vault-1.16.1.tar.gz 32997180 BLAKE2B e8c6ccf19ce2c48eee1b4b7544c6d164bd98be3d06a08397b06049bbb6aed9304df592bcb5103e943a629aca4c2e83f661b16469e3353c022e3ca552fa1afedb SHA512 e970004343abb2792aeea4db55a002d1c18701d309caab4a49e3f387028083b70dfa67b7ff34b60c5d4d34ffa8ac3bef308b7218a0344dffde3b000b0e5d43a9 diff --git a/app-admin/vault/files/vault-1.15.6-stubmaker-outside-git-repo-24678.patch b/app-admin/vault/files/vault-1.15.6-stubmaker-outside-git-repo-24678.patch new file mode 100644 index 000000000000..5b47f39cb81b --- /dev/null +++ b/app-admin/vault/files/vault-1.15.6-stubmaker-outside-git-repo-24678.patch @@ -0,0 +1,92 @@ +From cd6d0e1c593e158b8641529410d95e4b1722d5b2 Mon Sep 17 00:00:00 2001 +From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com> +Date: Thu, 4 Jan 2024 17:03:09 -0600 +Subject: [PATCH] Allow stubmaker to work outside of a git repository + +https://github.com/hashicorp/vault/pull/24678 + +Fixes: https://github.com/hashicorp/vault/issues/24677 +--- + tools/stubmaker/main.go | 58 +++++++++++++++++++++++------------------ + 1 file changed, 33 insertions(+), 25 deletions(-) + +diff --git a/tools/stubmaker/main.go b/tools/stubmaker/main.go +index 53676e08b8c84..15e95b6a45f60 100644 +--- a/tools/stubmaker/main.go ++++ b/tools/stubmaker/main.go +@@ -43,15 +43,21 @@ func main() { + DetectDotGit: true, + }) + if err != nil { +- fatal(err) ++ if err.Error() != "repository does not exist" { ++ fatal(err) ++ } ++ repo = nil + } + +- wt, err := repo.Worktree() +- if err != nil { +- fatal(err) +- } +- if !isEnterprise(wt) { +- return ++ var wt *git.Worktree ++ if repo != nil { ++ wt, err = repo.Worktree() ++ if err != nil { ++ fatal(err) ++ } ++ if !isEnterprise(wt) { ++ return ++ } + } + + // Read the file and figure out if we need to do anything. +@@ -80,26 +86,28 @@ func main() { + + // We'd like to write the file, but first make sure that we're not going + // to blow away anyone's work or overwrite a file already in git. +- head, err := repo.Head() +- if err != nil { +- fatal(err) +- } +- obj, err := repo.Object(plumbing.AnyObject, head.Hash()) +- if err != nil { +- fatal(err) +- } ++ if repo != nil { ++ head, err := repo.Head() ++ if err != nil { ++ fatal(err) ++ } ++ obj, err := repo.Object(plumbing.AnyObject, head.Hash()) ++ if err != nil { ++ fatal(err) ++ } + +- st, err := wt.Status() +- if err != nil { +- fatal(err) +- } ++ st, err := wt.Status() ++ if err != nil { ++ fatal(err) ++ } + +- tracked, err := inGit(wt, st, obj, outputFile) +- if err != nil { +- fatal(err) +- } +- if tracked { +- fatal(fmt.Errorf("output file %s exists in git, not overwriting", outputFile)) ++ tracked, err := inGit(wt, st, obj, outputFile) ++ if err != nil { ++ fatal(err) ++ } ++ if tracked { ++ fatal(fmt.Errorf("output file %s exists in git, not overwriting", outputFile)) ++ } + } + + // Now we can finally write the file diff --git a/app-admin/vault/vault-1.14.8.ebuild b/app-admin/vault/vault-1.15.6.ebuild index bca60ca1df89..0d3c950161cf 100644 --- a/app-admin/vault/vault-1.14.8.ebuild +++ b/app-admin/vault/vault-1.15.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,20 +9,19 @@ DESCRIPTION="A tool for managing secrets" HOMEPAGE="https://vaultproject.io/" VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz" -SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz - webui? ( - https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} - )" +SRC_URI="https://github.com/hashicorp/vault/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" webui? ( https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} )" +SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv" +KEYWORDS="amd64 ~arm64 ~riscv" IUSE="+webui" BDEPEND=" app-arch/zip dev-go/gox - >=dev-lang/go-1.15.3" + >=dev-lang/go-1.21" COMMON_DEPEND="acct-group/vault acct-user/vault" DEPEND="${COMMON_DEPEND}" @@ -33,7 +32,8 @@ FILECAPS=( ) RESTRICT="test" -S=${WORKDIR}/${P}-vendor +S=${WORKDIR}/${P} +PATCHES=("${FILESDIR}/${P}-stubmaker-outside-git-repo-24678.patch") src_unpack() { default diff --git a/app-admin/vault/vault-1.16.1.ebuild b/app-admin/vault/vault-1.16.1.ebuild new file mode 100644 index 000000000000..9956d1f746c1 --- /dev/null +++ b/app-admin/vault/vault-1.16.1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps go-module systemd + +DESCRIPTION="A tool for managing secrets" +HOMEPAGE="https://vaultproject.io/" + +VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz" +SRC_URI="https://github.com/hashicorp/vault/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" webui? ( https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} )" +SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" + +LICENSE="BUSL-1.1 MPL-2.0" +LICENSE+=" Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv" +IUSE="+webui" + +BDEPEND=" + app-arch/zip + dev-go/gox + >=dev-lang/go-1.21" +COMMON_DEPEND="acct-group/vault + acct-user/vault" + DEPEND="${COMMON_DEPEND}" + RDEPEND="${COMMON_DEPEND}" + +FILECAPS=( + -m 755 'cap_ipc_lock=+ep' usr/bin/${PN} +) + +RESTRICT="test" +S=${WORKDIR}/${P} +PATCHES=("${FILESDIR}/${PN}-1.15.6-stubmaker-outside-git-repo-24678.patch") + +src_unpack() { + default +} + +src_prepare() { + default + # Avoid the need to have a git checkout + sed -e 's:^\(GIT_COMMIT=\).*:\1:' \ + -e 's:^\(GIT_DIRTY=\).*:\1:' \ + -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \ + -e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \ + -i scripts/build.sh || die + sed -e "/hooks/d" \ + -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \ + -e "s/gofumpt/gofmt/g" \ + -i Makefile || die + if [[ -d "${WORKDIR}/http/web_ui" ]]; then + rm -rf "${S}/http/web_ui" || die + mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" || + die "mv failed" + else + mkdir -p "${S}/http/web_ui" || die + touch "${S}/http/web_ui/no_web_ui" || die + fi +} + +src_compile() { + mkdir "${T}"/bin || die + BUILD_TAGS="$(usex webui ui '')" \ + GOPATH="${T}" \ + XC_ARCH=$(go env GOARCH) \ + XC_OS=$(go env GOOS) \ + XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \ + emake bin +} + +src_install() { + dobin bin/${PN} + dodoc CHANGELOG.md CONTRIBUTING.md README.md + insinto /etc/${PN}.d + doins "${FILESDIR}/"*.json.example + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotated" "${PN}" + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + systemd_dounit "${FILESDIR}/${PN}.service" + keepdir /var/log/${PN} + fowners ${PN}:${PN} /var/log/${PN} +} diff --git a/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch b/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch new file mode 100644 index 000000000000..cb1ba1a8593e --- /dev/null +++ b/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch @@ -0,0 +1,11 @@ +--- a/WebappConfig/protect.py ++++ b/WebappConfig/protect.py +@@ -78,7 +78,7 @@ + + numbers = [] + prefix = self.protect_prefix +- rep = re.compile(prefix.replace('.','\.') + '(\d{4})_') ++ rep = re.compile(prefix.replace('.',r'\.') + r'(\d{4})_') + + for i in entries: + rem = rep.match(i) diff --git a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild index befaf688f6f1..171bf028c53a 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 prefix @@ -29,6 +29,10 @@ DEPEND="app-text/xmlto RDEPEND=" portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" +PATCHES=( + "${FILESDIR}"/webapp-config-1.55-py3.122-invalid-escape-sequence.patch +) + python_prepare_all() { # make the source from svn mirror the one in the tarball if [[ ${PV} == 9999* ]]; then diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild index 76caefb23e6d..cc2e8028b578 100644 --- a/app-admin/webapp-config/webapp-config-9999.ebuild +++ b/app-admin/webapp-config/webapp-config-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 prefix @@ -29,6 +29,10 @@ DEPEND="app-text/xmlto RDEPEND=" portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" +PATCHES=( + "${FILESDIR}"/webapp-config-1.55-py3.122-invalid-escape-sequence.patch +) + python_prepare_all() { # make the source from svn mirror the one in the tarball if [[ ${PV} == 9999* ]]; then diff --git a/app-admin/xkcdpass/Manifest b/app-admin/xkcdpass/Manifest index d2e738335a39..b6b56c6115d9 100644 --- a/app-admin/xkcdpass/Manifest +++ b/app-admin/xkcdpass/Manifest @@ -1,4 +1,2 @@ -DIST xkcdpass-1.19.4.tar.gz 2572291 BLAKE2B f36299ab66bc02f95a7811ebdf40fa62f441a0ef1eac27af8d380fca9643eb9c2444c988392900e5add8a2a22f4ef33766bc5904fb350520b0b7572e95898ecd SHA512 2a83473f6e2426f34ee89297056ca7d3949044f7e818f6d6501fd7852ac1ba9f860f8287ad6d366f13f46f580b0f3f7e9a3dfa160b262b4d00b00ed1c9f5da59 -DIST xkcdpass-1.19.5.tar.gz 2572430 BLAKE2B e955780492d2771558bc1f0716913f4e84a408d98049b2f5f23d53a56e6d660bc1afb2539b3f422bdc98df05ae065c51f0303ddaf2e268994420a22580aba2a2 SHA512 8a560247cb860377ef723b26610a6f784a891b4c8dfb2c5b55187df70e326d6ff2f1d31128dfc4e7136cbc15108c470658d896056177900e0eb419d14458348f -DIST xkcdpass-1.19.6.tar.gz 2572473 BLAKE2B 638aaa482f5d468e89daef7cb59dcba183b11280356a9e3a6aa518a0e8c0b9931057c1ffc6ebf3fd45111389a3f2952c4a668421f1b4822e64cbe0f1ade8d702 SHA512 ca61424432ab3749ee5a3fca884ed0897e5f342a84bfe208e4ae1dde3db60218f99f60d62cb77c05ccf8fd81ae393779869236aa2ee7cd7ebd3cf89663d47c13 DIST xkcdpass-1.19.8.tar.gz 2689908 BLAKE2B 68d0e6b2799773433962ee19ede47f5983839f4e4cecd4939205c2f0872228b4da5a107176d3931fc41aa47be8e51b7fb7383c1da1898684484be98913c088f9 SHA512 f218a9afdf103444558233f9fe32655d2c604f3553d2782a923f73baa4d69495871557a753a5f38be4607bd373df43cf425c0cc6675b0b1b34723098fdeff7b5 +DIST xkcdpass-1.19.9.tar.gz 2689919 BLAKE2B 089997c82569afa40fd2f7d2046b0dd284491d080597513f963c4e6af49ad20c4e01397af0f1dc3b91a23b95666b492eaaf85c3ac1c8f87d3250e012fd00bdc1 SHA512 b326160e181f0e0485514f10efa6cd8e98e139a8a89af37bad511713a7f46750f6da3ff1eeab20b850e0b5c607d0e329966d100d6bd4fe43b80d3edce090a2c1 diff --git a/app-admin/xkcdpass/files/xkcdpass-1.19.4-no-examples-in-site-packages.patch b/app-admin/xkcdpass/files/xkcdpass-1.19.4-no-examples-in-site-packages.patch deleted file mode 100644 index c2ad0fe63460..000000000000 --- a/app-admin/xkcdpass/files/xkcdpass-1.19.4-no-examples-in-site-packages.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 2f35f86..eed1e7b 100644 ---- a/setup.py -+++ b/setup.py -@@ -11,7 +11,7 @@ setup( - description='Generate secure multiword passwords/passphrases, inspired by XKCD', - long_description=open('README.rst', encoding='utf-8').read(), - #packages=['xkcdpass'], -- packages=find_namespace_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]), -+ packages=find_namespace_packages(exclude=["examples", "*.tests", "*.tests.*", "tests.*", "tests"]), - zip_safe=False, - license='BSD', - include_package_data=True, diff --git a/app-admin/xkcdpass/xkcdpass-1.19.4.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.4.ebuild deleted file mode 100644 index 767282c1f31d..000000000000 --- a/app-admin/xkcdpass/xkcdpass-1.19.4.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 pypi - -DESCRIPTION="Password generator inspired by XKCD 936" -HOMEPAGE="https://github.com/redacted/XKCD-password-generator" - -LICENSE="BSD CC-BY-3.0 - l10n_de? ( GPL-3 ) - l10n_it? ( CC-BY-SA-3.0 ) - l10n_no? ( CC-BY-4.0 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt" - -distutils_enable_tests pytest -REQUIRED_USE="test? ( l10n_en )" - -PATCHES=( "${FILESDIR}"/xkcdpass-1.19.4-no-examples-in-site-packages.patch ) - -src_prepare() { - default - - use l10n_de || rm ${PN}/static/{ger-anlx,eff_large_de_sample.wordlist} - use l10n_en || rm ${PN}/static/{eff-short,eff-special,legacy} - use l10n_es || rm ${PN}/static/spa-mich - use l10n_fi || rm ${PN}/static/fin-kotus - use l10n_fr || rm ${PN}/static/fr-* - use l10n_it || rm ${PN}/static/ita-wiki - use l10n_no || rm ${PN}/static/nor-nb - use l10n_pt || rm ${PN}/static/pt-* -} - -python_install_all() { - distutils-r1_python_install_all - doman ${PN}.1 -} diff --git a/app-admin/xkcdpass/xkcdpass-1.19.6.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.6.ebuild deleted file mode 100644 index 767282c1f31d..000000000000 --- a/app-admin/xkcdpass/xkcdpass-1.19.6.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 pypi - -DESCRIPTION="Password generator inspired by XKCD 936" -HOMEPAGE="https://github.com/redacted/XKCD-password-generator" - -LICENSE="BSD CC-BY-3.0 - l10n_de? ( GPL-3 ) - l10n_it? ( CC-BY-SA-3.0 ) - l10n_no? ( CC-BY-4.0 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt" - -distutils_enable_tests pytest -REQUIRED_USE="test? ( l10n_en )" - -PATCHES=( "${FILESDIR}"/xkcdpass-1.19.4-no-examples-in-site-packages.patch ) - -src_prepare() { - default - - use l10n_de || rm ${PN}/static/{ger-anlx,eff_large_de_sample.wordlist} - use l10n_en || rm ${PN}/static/{eff-short,eff-special,legacy} - use l10n_es || rm ${PN}/static/spa-mich - use l10n_fi || rm ${PN}/static/fin-kotus - use l10n_fr || rm ${PN}/static/fr-* - use l10n_it || rm ${PN}/static/ita-wiki - use l10n_no || rm ${PN}/static/nor-nb - use l10n_pt || rm ${PN}/static/pt-* -} - -python_install_all() { - distutils-r1_python_install_all - doman ${PN}.1 -} diff --git a/app-admin/xkcdpass/xkcdpass-1.19.8.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.8.ebuild index d76304959988..206d383064ae 100644 --- a/app-admin/xkcdpass/xkcdpass-1.19.8.ebuild +++ b/app-admin/xkcdpass/xkcdpass-1.19.8.ebuild @@ -1,10 +1,10 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit distutils-r1 pypi DESCRIPTION="Password generator inspired by XKCD 936" diff --git a/app-admin/xkcdpass/xkcdpass-1.19.5.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.9.ebuild index 767282c1f31d..206d383064ae 100644 --- a/app-admin/xkcdpass/xkcdpass-1.19.5.ebuild +++ b/app-admin/xkcdpass/xkcdpass-1.19.9.ebuild @@ -1,10 +1,10 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit distutils-r1 pypi DESCRIPTION="Password generator inspired by XKCD 936" @@ -21,8 +21,6 @@ IUSE="l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt" distutils_enable_tests pytest REQUIRED_USE="test? ( l10n_en )" -PATCHES=( "${FILESDIR}"/xkcdpass-1.19.4-no-examples-in-site-packages.patch ) - src_prepare() { default diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest index 2f92a34ddb06..21811777c9b8 100644 --- a/app-admin/xstow/Manifest +++ b/app-admin/xstow/Manifest @@ -1 +1,2 @@ DIST xstow-1.1.0.tar.bz2 187761 BLAKE2B ed3822e638aedf8900a3baba62a5af9de9d7b98dcdf27ca81a6898353b9f5c7f767ec7d8e68ead4d5ef318af5a6eda2b1cc68a5c80a6a8ad2b9c8adf03ae3377 SHA512 30f2e0be0c2aba668b4cc781fe69ac74c2460cc681c6b47a55ee66af5c0f2ac14dee9fe2e95a288ce06059378407a2b99d2156430a5a6dcbf06def793f579015 +DIST xstow-1.1.1.tar.bz2 188334 BLAKE2B 13b079b4c0bdfc68837d3674eb64852d6c8bd341541c927703eed7e302ce36328bc814c618972365b60bd7562a4a2398c6a881a0a42c5778523197e41cfde7df SHA512 86154bd562e1dcb068a2c766a849975a4e6c9c343d89d47f8dd339a03b73aceb2dfb8523e2bc40df3ceb673a1a9f7991737e982c0c1a2cc0bd9fcdf8fd7c3113 diff --git a/app-admin/xstow/xstow-1.1.0.ebuild b/app-admin/xstow/xstow-1.1.0.ebuild index 827b9a734e87..3f66da863573 100644 --- a/app-admin/xstow/xstow-1.1.0.ebuild +++ b/app-admin/xstow/xstow-1.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="Replacement for GNU stow with extensions" HOMEPAGE="https://xstow.sourceforge.net/" -SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/xstow/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" diff --git a/app-admin/xstow/xstow-1.1.1.ebuild b/app-admin/xstow/xstow-1.1.1.ebuild new file mode 100644 index 000000000000..d6dcfa3ad50d --- /dev/null +++ b/app-admin/xstow/xstow-1.1.1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Replacement for GNU stow with extensions" +HOMEPAGE="https://github.com/majorkingleo/xstow" +SRC_URI="https://github.com/majorkingleo/${PN}/releases/download/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="ncurses" + +DEPEND="ncurses? ( sys-libs/ncurses:= )" +RDEPEND="${DEPEND}" + +src_configure() { + econf $(use_with ncurses curses) +} + +src_install() { + emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install + einstalldocs + + # Create new STOWDIR + keepdir /var/lib/xstow + + # Install env.d file to add STOWDIR to PATH and LDPATH + doenvd "${FILESDIR}"/99xstow +} + +pkg_postinst() { + elog "We now recommend that you use /var/lib/xstow as your STOWDIR" + elog "instead of /usr/local in order to avoid conflicts with the" + elog "symlink from /usr/lib64 -> /usr/lib. See Bug 246264" + elog "(regarding app-admin/stow, equally applicable to XStow) for" + elog "more details on this change." + elog "For your convenience, PATH has been updated to include" + elog "/var/lib/bin." +} diff --git a/app-admin/yadm/yadm-3.2.2.ebuild b/app-admin/yadm/yadm-3.2.2.ebuild index 154ee7556273..782673d90f70 100644 --- a/app-admin/yadm/yadm-3.2.2.ebuild +++ b/app-admin/yadm/yadm-3.2.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit bash-completion-r1 python-any-r1 DESCRIPTION="Git based tool for managing dotfiles" |