From 2a5945e8688d3afc432c5f32eedad3b1f306b073 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 12 Jul 2023 22:33:21 +0100 Subject: gentoo auto-resync : 12:07:2023 - 22:33:21 --- dev-util/Manifest.gz | Bin 68457 -> 68461 bytes dev-util/aruba/Manifest | 2 +- dev-util/aruba/aruba-2.1.0.ebuild | 6 +- dev-util/catalyst/Manifest | 4 +- dev-util/catalyst/catalyst-3.0.22-r2.ebuild | 74 ------------------------- dev-util/catalyst/catalyst-3.0.22-r3.ebuild | 82 ++++++++++++++++++++++++++++ dev-util/catalyst/catalyst-9999.ebuild | 4 ++ 7 files changed, 93 insertions(+), 79 deletions(-) delete mode 100644 dev-util/catalyst/catalyst-3.0.22-r2.ebuild create mode 100644 dev-util/catalyst/catalyst-3.0.22-r3.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 493550ca81bf..fac0c08e2ce9 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest index 9a0dacb36a18..0ddcadcf6b74 100644 --- a/dev-util/aruba/Manifest +++ b/dev-util/aruba/Manifest @@ -1,5 +1,5 @@ DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e DIST aruba-2.1.0.tar.gz 130073 BLAKE2B 534bc67cbc4b5871a1bc6e37170586b3a5829e70d611dde9fe130a4cfdce98044c1a3fe29de961419a605eb4bbe8e21b8efb52a61aa8a2d2b2b9fa7e42bd3169 SHA512 f30d67ba94157eaf0477a09f4049174ff0cd6195b92c4121117775e56502178525eb5a7f69148e7f5531d6d4e67f4ecd9d840e693c38340a10819a19247021fa EBUILD aruba-0.6.2-r3.ebuild 1044 BLAKE2B 20631d4dc9c2dd8371b93f67c0aa1cc92a4fc3c16d84cc7eccc0d91bd3e60d02caa985ef01dc4b21b80fb8afdcc2b28d9b633dd7a4de15acef0d9ed993258a51 SHA512 4848be3d58ed4407dc55f7f6ae9267b92cb1ebad9dd12d1cf97fe9e50e813dc8d8ea3086db3ff5962041f8da160c04d983f34c8fafac5009c4f9dc911517e10e -EBUILD aruba-2.1.0.ebuild 2108 BLAKE2B 0c66771968dd4cbbf2117bf342a418421d990e75dc781bb3400ae25d51c3f8ee5884da166331d24adeb10d9930faa920940dc3572ccc04a40dc586fc58bb7ba0 SHA512 3dcbd4b1e4673c2d74626080dd96866d41941e5014abd23b52fcc13518bff1f9c71becbdb35833be131da0bf942885158afb12cf6598599619bda27809a5f9d9 +EBUILD aruba-2.1.0.ebuild 2241 BLAKE2B b9a220b21e0347a1b5ed8e332d242a5f835dd1e06c26ab328cc124a2fd2507fa840804458b84ea674041293e1f6a3c245114a4851cd812f808d6f3bee09bd565 SHA512 66ea5442ff6cd7706bae991d8c98f88b0f2eebc057eae141bbbe202a2c58814266fdb94f5b6df56a50fc603f8170cb7a64c4c27d2dc3210c85cd2b45990c6c03 MISC metadata.xml 297 BLAKE2B 013e79bd25020910ff023586ed3e1349ee1dcbf195b73c230133775c2fe031794f91fd7e54d4df43bfc61de716f452492f2b7af3ba7dbf7e04cf4a47ac16a00d SHA512 c57a4e881304d3bdc2001d4f221ec7d4789223fa36b104271ec9a2439e7730ccbfd349b16209ac6a59fe782618b14423cf3b7b345ef2a7d4944a535eaed75c9a diff --git a/dev-util/aruba/aruba-2.1.0.ebuild b/dev-util/aruba/aruba-2.1.0.ebuild index 08d6587bf10d..81e0dbdc8b26 100644 --- a/dev-util/aruba/aruba-2.1.0.ebuild +++ b/dev-util/aruba/aruba-2.1.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby27 ruby30 ruby31" +USE_RUBY="ruby30 ruby31 ruby32" RUBY_FAKEGEM_RECIPE_TEST="cucumber" RUBY_FAKEGEM_RECIPE_DOC="none" @@ -49,11 +49,13 @@ all_ruby_prepare() { sed -e 's:_relative ": "./:' \ -e 's/git ls-files -z/find * -print0/' \ -e '/\(pry-doc\|rake-manifest\|rubocop\|yard-junk\)/ s:^:#:' \ + -e '/simplecov/ s/22/23/' \ -i ${RUBY_FAKEGEM_GEMSPEC} || die # Avoid features with minor output differences sed -i -e '/Use .aruba. with .Minitest./i\ @wip' features/01_getting_started_with_aruba/supported_testing_frameworks.feature || die sed -i -e '/Create files for Minitest/i\ @wip' features/06_use_aruba_cli/initialize_project_with_aruba.feature || die + rm -f features/03_testing_frameworks/cucumber/steps/command/wait_for_output_of_command.feature || die # Avoid feature that requires aruba to be installed already rm -r features/03_testing_frameworks/cucumber/disable_bundler.feature || die diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest index 4c1f3e18e9bc..bc11468fadb6 100644 --- a/dev-util/catalyst/Manifest +++ b/dev-util/catalyst/Manifest @@ -2,6 +2,6 @@ DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 6ecf59edde24cbec6d072a31680b75e2e7f1 DIST catalyst-3.0.22.tar.bz2 620528 BLAKE2B f0eb5bf1052ba65bcdab4a14fe8ab564b6396c8a7271ee16c664b90c595df2a7bcda480279d64e0c7c6ff2045e0119a6a3afec75819a673ae721e77587e1f2b2 SHA512 c2b2d20ee6581b7c9c837fd64e798b0d1b0e5cc00346827cdf7154af8e8b6e279d32ab0d7f10314aa8d50923065e8b1121d2c01a506521cdae04736769cf6ba4 EBUILD catalyst-3.0.21-r1.ebuild 1918 BLAKE2B e3a4746c61239f51104456b6bca825a7d53deb3d696e7ef3d366958d5db527b929171cdb51d93817cc97146dd7728fa81df71e157f06f136dd6dda81e34c7418 SHA512 589a9d89eabde0d71f2a23e1e0a424a3b6aa0f05c41ed7949afd42425316166c1b9369cfa04af1308a48e53ee31ca69d3e352139a79073eeb860c640b8f3808f EBUILD catalyst-3.0.22-r1.ebuild 1918 BLAKE2B 3f76b8f2578f78564fcf3797391aa9b8670cbf0d0f12a8f8013f8f81d4aba8176276734608e50185782393b8f5698851b8c11368130230576aa3b1c24903a0b9 SHA512 e1676547fd7053be871b2ceef7ff91c2bbdb0c3174a0277eb9032a8e0b7e7920877c28052f169cede7a3f9f03cd94c75cacf337372df69f5d94ce83929c6f7e6 -EBUILD catalyst-3.0.22-r2.ebuild 1981 BLAKE2B 0d6fed0410c6189cdbf28149b05ce1a70998c475dd6675ffec61df1afc7a591b55df23b359c9e608c4e2bbe79d7305c6103d6686eb398f4aff1845baa4023701 SHA512 3e30a645370960278e2e8638fc0f3ed17b03dd6996decc3b95d9e733be484c44535c5ebe02abfa027bc7ce875fe0a08b6ebbd84220fb8696ddee9881edaad553 -EBUILD catalyst-9999.ebuild 2546 BLAKE2B 23d8661fa775b980a5c8c3b59cbce6d0f9319d4034a8cd2a918900d8220b6edee40145f6738738029ae515fff88f469632c10085e82664f61b917b94a234036a SHA512 b8edee291c3a70d9d33f01694738b96fd200ff3c6f82bc51c6f610d5363ab1a4b9371f53158ac8ba82014843038e68482389553489f89b7e624e58a6a9282fdd +EBUILD catalyst-3.0.22-r3.ebuild 2133 BLAKE2B b4d2cc49991cdba68998064a94d9f165b424ab542dc0e2275db610b7289b53aaaa7f8bc8ac8d60383a68020afc3ad71904cd11934439d258d54f04a21a74b1b5 SHA512 11d1cda758912972796093397576d558848f185ac0629749e6b6733ffcbc4b2d5caaa808eec4e203cd62c98ff9519db9cafdd55a3d69d77430990b47c5e38d31 +EBUILD catalyst-9999.ebuild 2653 BLAKE2B 5e7b821756177ac7cb316aabf2fff87bf3481b9c05e1ac502ce397755fceb14a7c27d16c8a2ea5bfe9ac07243442313257014d1f2d87d2be00c49ecd01bb915c SHA512 34fb45502bec7583130d941d437cbfdb7feb470758d37892c26f4e8877ad51280ceebe6b33539b31ddc42fc14d91359b18221c6b5198fe7656239cc29eddc528 MISC metadata.xml 652 BLAKE2B 798bed21d492c2404691dab86198b443b72c43cb0a68f8476bb6d31167d19168930fd2969bdd384fcbae0efb0285b1a0e6927ce4eeeb3a995e617e598ff2cd6f SHA512 ae5920383badc6d4678d3efcffd55a20693c711fd12f358e12daae5f131b7daf4df5171ae73de93b908798772dac193b7564f8df352682f8e323aab1f1f66b13 diff --git a/dev-util/catalyst/catalyst-3.0.22-r2.ebuild b/dev-util/catalyst/catalyst-3.0.22-r2.ebuild deleted file mode 100644 index 2cde6cf92ea9..000000000000 --- a/dev-util/catalyst/catalyst-3.0.22-r2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} == *9999* ]]; then - SRC_ECLASS="git-r3" - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git" - EGIT_BRANCH="master" -else - SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 ${SRC_ECLASS} - -DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" -HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="ccache doc +iso system-bootloader" - -DEPEND=" - app-text/asciidoc - >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] - dev-python/fasteners[${PYTHON_USEDEP}] -" -RDEPEND=" - >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] - dev-python/fasteners[${PYTHON_USEDEP}] - >=dev-python/pydecomp-0.3[${PYTHON_USEDEP}] - app-arch/lbzip2 - app-crypt/shash - sys-fs/dosfstools - || ( - app-arch/tar[xattr] - app-arch/libarchive[xattr] - ) - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - iso? ( app-cdr/cdrtools ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) -" -PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 - sys-boot/grub:2 - amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) - x86? ( sys-boot/grub[grub_platforms_efi-32] ) - sys-boot/syslinux - sys-boot/shim )" - -python_prepare_all() { - python_setup - echo VERSION="${PV}" "${PYTHON}" setup.py set_version - VERSION="${PV}" "${PYTHON}" setup.py set_version || die - distutils-r1_python_prepare_all -} - -# Build man pages here so as to not clobber default src_compile -src_configure() { - # build the man pages and docs - emake -} - -python_install_all() { - distutils-r1_python_install_all - if use doc; then - dodoc files/HOWTO.html files/docbook-xsl.css - fi -} diff --git a/dev-util/catalyst/catalyst-3.0.22-r3.ebuild b/dev-util/catalyst/catalyst-3.0.22-r3.ebuild new file mode 100644 index 000000000000..49063325fdd8 --- /dev/null +++ b/dev-util/catalyst/catalyst-3.0.22-r3.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == *9999* ]]; then + SRC_ECLASS="git-r3" + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git" + EGIT_BRANCH="master" +else + SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" +fi + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 ${SRC_ECLASS} + +DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" +HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="ccache doc +iso system-bootloader" + +DEPEND=" + app-text/asciidoc + >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] + dev-python/fasteners[${PYTHON_USEDEP}] +" +RDEPEND=" + >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] + dev-python/fasteners[${PYTHON_USEDEP}] + >=dev-python/pydecomp-0.3[${PYTHON_USEDEP}] + app-arch/lbzip2 + app-crypt/shash + sys-fs/dosfstools + || ( + app-arch/tar[xattr] + app-arch/libarchive[xattr] + ) + amd64? ( >=sys-boot/syslinux-3.72 ) + x86? ( >=sys-boot/syslinux-3.72 ) + ccache? ( dev-util/ccache ) + iso? ( app-cdr/cdrtools ) + kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) +" +PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 + sys-boot/grub:2 + amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) + x86? ( sys-boot/grub[grub_platforms_efi-32] ) + sys-boot/syslinux + sys-boot/shim )" + +python_prepare_all() { + python_setup + echo VERSION="${PV}" "${PYTHON}" setup.py set_version + VERSION="${PV}" "${PYTHON}" setup.py set_version || die + distutils-r1_python_prepare_all +} + +# Build man pages here so as to not clobber default src_compile +src_configure() { + # build the man pages and docs + emake +} + +python_install_all() { + distutils-r1_python_install_all + if use doc; then + dodoc files/HOWTO.html files/docbook-xsl.css + fi +} + +src_install() { + distutils-r1_src_install + + doman files/catalyst.1 files/catalyst-config.5 files/catalyst-spec.5 + insinto /etc/catalyst + doins etc/* +} diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild index 06017c76d1fb..ab85324f0c98 100644 --- a/dev-util/catalyst/catalyst-9999.ebuild +++ b/dev-util/catalyst/catalyst-9999.ebuild @@ -108,6 +108,10 @@ src_install() { echo 'd /var/tmp/catalyst 0755 root root' > "${T}"/catalyst-tmpdir.conf dotmpfiles "${T}"/catalyst-tmpdir.conf + + doman files/catalyst.1 files/catalyst-config.5 files/catalyst-spec.5 + insinto /etc/catalyst + doins etc/* } pkg_postinst() { -- cgit v1.2.3