From ccd1860647f01c037c1e6d26c3a2d01c87f3196d Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Fri, 14 Jun 2024 15:14:23 +0300 Subject: [PATCH 01/18] net-dialup/speedtouch-usb: EAPI=8, refactor, cleanup Signed-off-by: Arthur Zamarin --- .../speedtouch-usb-3.0.1.2-r3.ebuild | 92 ------------------- .../speedtouch-usb-3.0.1.2-r4.ebuild | 75 +++++++++++++++ 2 files changed, 75 insertions(+), 92 deletions(-) delete mode 100644 net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r3.ebuild create mode 100644 net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r4.ebuild diff --git a/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r3.ebuild b/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r3.ebuild deleted file mode 100644 index c8dc23c17618d..0000000000000 --- a/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r3.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info - -DESCRIPTION="Firmware and configuration instructions for Alcatel SpeedTouch USB modems" -HOMEPAGE="http://www.speedtouch.com/" -SRC_URI="http://www.speedtouch.com/download/drivers/USB/SpeedTouch330_firmware_${PV//./}.zip" - -# Taken from http://www.speedtouch.com/driver_upgrade_lx_3.0.1.2.htm -LICENSE="SpeedTouch-USB-Firmware" -SLOT="0" -KEYWORDS="~amd64 x86" - -RDEPEND="net-dialup/ppp" -DEPEND="app-arch/unzip" - -S="${WORKDIR}" - -src_install() { - local FILE_VER="${PV#*.}" - FILE_VER="${PV%%.*}.${FILE_VER//./}" # {major_ver}.{minor_digits} - - # Extract the "stage 1" portion of the firmware - dd if=KQD6_${FILE_VER} of=speedtch-1.bin.2 \ - ibs=1 obs=991 count=991 skip=36 &> /dev/null \ - || die "Extraction of stage 1 firmware (step 1) failed" - - dd if=ZZZL_${FILE_VER} of=speedtch-1.bin.4 \ - ibs=1 obs=935 count=935 skip=32 &> /dev/null \ - || die "Extraction of stage 1 firmware (step 2) failed" - - # Extract the "stage 2" portion of the firmware - dd if=KQD6_${FILE_VER} of=speedtch-2.bin.2 \ - ibs=1 obs=762650 count=762650 skip=1027 &> /dev/null \ - || die "Extraction of stage 2 firmware (step 1) failed" - - dd if=ZZZL_${FILE_VER} of=speedtch-2.bin.4 \ - ibs=1 obs=775545 count=775545 skip=967 &> /dev/null \ - || die "Extraction of stage 2 firmware (step 2) failed" - - # Copy to the firmware directory - insinto /lib/firmware - insopts -m 600 - doins speedtch-{1,2}.bin.{2,4} - - # Symlinks for other revisions of the modem - pushd "${D}/lib/firmware" >/dev/null || die - for n in 1 2 ; do - for rev in 0 1 ; do - ln -sfn speedtch-${n}.bin.2 speedtch-${n}.bin.${rev} - done - # Seems like a reasonable guess, for revision 3 - ln -sfn speedtch-${stub}${n}.bin.4 speedtch-${n}.bin.3 - done - popd >/dev/null || die - - # Documentation necessary to complete the setup - dodoc "${FILESDIR}/README" -} - -pkg_postinst() { - [[ -e /etc/hotplug/usb.usermap ]] && grep -E -q " 0x06[bB]9 +0x4061 " /etc/hotplug/usb.usermap && \ - ewarn "Please remove the SpeedTouch line from /etc/hotplug/usb.usermap" - - # Check kernel configuration - local CONFIG_CHECK="~FW_LOADER ~NET ~PACKET ~ATM ~NETDEVICES ~USB_DEVICEFS ~USB_ATM ~USB_SPEEDTOUCH \ - ~PPP ~PPPOATM ~PPPOE ~ATM_BR2684" - local WARNING_PPPOATM="CONFIG_PPPOATM:\t is not set (required for PPPoA links)" - local WARNING_PPPOE="CONFIG_PPPOE:\t is not set (required for PPPoE links)" - local WARNING_ATM_BR2684="CONFIG_ATM_BR2684:\t is not set (required for PPPoE links)" - check_extra_config - echo - - # Check user-space for PPPoA support - if ! has_version net-dialup/ppp[atm] ; then - ewarn "Run the following command if connecting via PPPoA protocol:" - ewarn " euse -E atm && emerge net-dialup/ppp" - echo - fi - # Check user-space for PPPoE support - if ! has_version net-dialup/linux-atm ; then - ewarn "Run the following command if connecting via PPPoE protocol:" - ewarn " emerge net-dialup/linux-atm" - echo - fi - - ewarn "To complete the installation, you must read the documentation in" - ewarn " ${ROOT}usr/share/doc/${PF}" -} diff --git a/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r4.ebuild b/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r4.ebuild new file mode 100644 index 0000000000000..1431187f23557 --- /dev/null +++ b/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r4.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo linux-info optfeature + +DESCRIPTION="Firmware and configuration instructions for Alcatel SpeedTouch USB modems" +HOMEPAGE="http://www.speedtouch.com/" +SRC_URI="http://www.speedtouch.com/download/drivers/USB/SpeedTouch330_firmware_${PV//./}.zip" +S=${WORKDIR} + +# Taken from http://www.speedtouch.com/driver_upgrade_lx_3.0.1.2.htm +LICENSE="SpeedTouch-USB-Firmware" +SLOT="0" +KEYWORDS="~amd64 x86" + +RDEPEND="net-dialup/ppp" +BDEPEND="app-arch/unzip" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != buildonly ]]; then + local CONFIG_CHECK="~FW_LOADER ~NET ~PACKET ~ATM ~NETDEVICES ~USB_DEVICEFS ~USB_ATM ~USB_SPEEDTOUCH \ + ~PPP ~PPPOATM ~PPPOE ~ATM_BR2684" + local WARNING_PPPOATM="CONFIG_PPPOATM:\t is not set (required for PPPoA links)" + local WARNING_PPPOE="CONFIG_PPPOE:\t is not set (required for PPPoE links)" + local WARNING_ATM_BR2684="CONFIG_ATM_BR2684:\t is not set (required for PPPoE links)" + check_extra_config + fi +} + +src_compile() { + local VER=$(ver_rs 2-4 '') # {major_ver}.{minor_digits} + + # Extract the "stage 1" portion of the firmware + edob -m "Extraction of stage 1 firmware (step 1)" \ + dd if=KQD6_${VER} of="${T}/speedtch-1.bin.2" ibs=1 obs=991 count=991 skip=36 + edob -m "Extraction of stage 1 firmware (step 2)" \ + dd if=ZZZL_${VER} of="${T}/speedtch-1.bin.4" ibs=1 obs=935 count=935 skip=32 + + # Extract the "stage 2" portion of the firmware + edob -m "Extraction of stage 2 firmware (step 1)" \ + dd if=KQD6_${VER} of="${T}/speedtch-2.bin.2" ibs=1 obs=762650 count=762650 skip=1027 + edob -m "Extraction of stage 2 firmware (step 2)" \ + dd if=ZZZL_${VER} of="${T}/speedtch-2.bin.4" ibs=1 obs=775545 count=775545 skip=967 +} + +src_install() { + # Copy to the firmware directory + insinto /lib/firmware + insopts -m 600 + doins "${T}"/speedtch-{1,2}.bin.{2,4} + + # Symlinks for other revisions of the modem + for n in 1 2 ; do + dosym speedtch-${n}.bin.2 /lib/firmware/speedtch-${n}.bin.0 + dosym speedtch-${n}.bin.2 /lib/firmware/speedtch-${n}.bin.1 + # Seems like a reasonable guess, for revision 3 + dosym speedtch-${n}.bin.4 /lib/firmware/speedtch-${n}.bin.3 + done + + # Documentation necessary to complete the setup + dodoc "${FILESDIR}/README" +} + +pkg_postinst() { + [[ -e /etc/hotplug/usb.usermap ]] && grep -E -q " 0x06[bB]9 +0x4061 " /etc/hotplug/usb.usermap && \ + ewarn "Please remove the SpeedTouch line from /etc/hotplug/usb.usermap" + + optfeature "connecting via PPPoA protocol" "net-dialup/ppp[atm]" + optfeature "connecting via PPPoE protocol" "net-dialup/linux-atm" + + ewarn "To complete the installation, you must read the documentation in" + ewarn " ${ROOT}/usr/share/doc/${PF}" +} From 451dc9f1cd791b163e7fe44899aac08d0de92296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 14 Jun 2024 14:07:51 +0200 Subject: [PATCH 02/18] dev-python/pydantic: Remove old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/pydantic/Manifest | 1 - dev-python/pydantic/pydantic-2.7.1.ebuild | 55 ----------------------- 2 files changed, 56 deletions(-) delete mode 100644 dev-python/pydantic/pydantic-2.7.1.ebuild diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest index 32e39d677a702..9d5ed11e1f7dd 100644 --- a/dev-python/pydantic/Manifest +++ b/dev-python/pydantic/Manifest @@ -1,4 +1,3 @@ -DIST pydantic-2.7.1.tar.gz 713923 BLAKE2B deeb9a63b290c8c3227c386b2982e11fb9385d16cb30e3522138219aef526dd7a077ddf496c92f8e3ed34ccbe21654177c539727e75bc209915f27817dfc62df SHA512 6b85c37384629e3df5f2b58e39ee9bf67f902b1ad2b05eb1298f03da8a945fc8f0865408948ad5deef76ca1d014f360ba778d4d957b6e7e158d2aa5c22861bd9 DIST pydantic-2.7.2.tar.gz 714293 BLAKE2B 0c8e647930b9ef1abfa1818b7d71eb41e5032d835f6772c60caab1cd02473cf163e8e2259bfcb57894c868242ebd6a8f343cee6ae7a3a49aa45b14ae20675269 SHA512 0ef9932afb1a57cf79bbd4a877cf002384f18cf32a7132a9913642ac6d273284d0bc7f8d8fc66361e61a0584cf38ef4630d68755567878f6f907cde0d9e9bdc1 DIST pydantic-2.7.3.tar.gz 714386 BLAKE2B 6f9e9c9d4c7e6e643d5b72cb368e44e2875a99f94b00525fd581906df7d5522f4467e2e6139bb893d83d27388a09e7935089684c62098e8d7770160b341e4295 SHA512 6d43e741444036acd38094e73966bf98fa318512a5b54774a08fa6bfc94f500a2448d9e96ebc76741a3f30a6cd86b96aa8fd98acabe2846744a0b443502d99a4 DIST pydantic-2.7.4.tar.gz 714127 BLAKE2B c9d6df84799d1c8a69bf7d203609db3ba533380919d1f47ae84eb83186ef9ffbbab5bea9b9c4918c65d35d4b2103107df3c7e5e314195bd84807d216226490b6 SHA512 9a36041a24306761f2528aaca196d0b3e160cf46d71596fcd3df0169b9dd68ce810b88bcbe15dc9c0126551d0d7e33e4c3014b97daaf5d68ce68c0f8d6ffaf81 diff --git a/dev-python/pydantic/pydantic-2.7.1.ebuild b/dev-python/pydantic/pydantic-2.7.1.ebuild deleted file mode 100644 index be197bf2b6566..0000000000000 --- a/dev-python/pydantic/pydantic-2.7.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( pypy3 python3_{10..12} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Data parsing and validation using Python type hints" -HOMEPAGE=" - https://github.com/pydantic/pydantic/ - https://pypi.org/project/pydantic/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - >=dev-python/annotated-types-0.4.0[${PYTHON_USEDEP}] - ~dev-python/pydantic-core-2.18.2[${PYTHON_USEDEP}] - >=dev-python/typing-extensions-4.6.1[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}] - test? ( - dev-python/cloudpickle[${PYTHON_USEDEP}] - dev-python/dirty-equals[${PYTHON_USEDEP}] - >=dev-python/email-validator-2.0.0[${PYTHON_USEDEP}] - >=dev-python/Faker-18.13.0[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - sed -i -e '/benchmark/d' pyproject.toml || die - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=() - local EPYTEST_IGNORE=( - # require pytest-examples - tests/test_docs.py - # benchmarks - tests/benchmarks - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p pytest_mock -} From 09a0292f0a59179f805fadab2e391f7ea240c6fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 14 Jun 2024 14:08:09 +0200 Subject: [PATCH 03/18] dev-python/pydantic-core: Remove old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/pydantic-core/Manifest | 8 - .../pydantic-core/pydantic-core-2.18.2.ebuild | 151 ------------------ 2 files changed, 159 deletions(-) delete mode 100644 dev-python/pydantic-core/pydantic-core-2.18.2.ebuild diff --git a/dev-python/pydantic-core/Manifest b/dev-python/pydantic-core/Manifest index a57f44e64bdcc..cf1e5b465c4ea 100644 --- a/dev-python/pydantic-core/Manifest +++ b/dev-python/pydantic-core/Manifest @@ -36,25 +36,18 @@ DIST parking_lot_core-0.9.8.crate 32383 BLAKE2B 2f9666872894d1c85895437d1353f9e1 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44 DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c DIST proc-macro2-1.0.76.crate 45660 BLAKE2B 40b538d9d9fec10b9e4b147ce0a86efb10feedf9e0452e5568e8ad7d2b88a201ca6ffd2cd62d8815a1ee72d557fe6280120a913868c3d868c1235686742cd8b8 SHA512 2ea7ade475171166489ab3e745e8c526e49c7521bc39b1bfec6dd2fd0807fd3cc5579235f77534be855f9ecab481205e77e66b14ebb22e66d2c3cff842567247 -DIST pydantic_core-2.18.2.tar.gz 383446 BLAKE2B 59e5a7f5c9fc911532997bf8a5f0937dcc26dd4d7e8b775bdbd9fd18ffcf2ade34686d159d2b7770a436f3b11fad5533cb556f459bc927fe5c4f33e3460423ee SHA512 d771815ac52e6aeb1779e108f7571e72d302e0b74d38f040d40eaa210259763cbbbf339824e3b35e827d6f0e2e00d7a1c019110ee93fb6908865a47fbe8a6890 DIST pydantic_core-2.18.3.tar.gz 384545 BLAKE2B 6aaa56613925ba97e193b33ab409d4cfb6c539da1951d708dd4eb866d4f173a2ed9a58f03858501351833c8cd0bbb85e52ac7fcf48d3b8e621832af90f6f7cde SHA512 b53abe36247b8289650023a624953f4eb6f84273ccf85dfa2dcaa1c786e2d416bd296b28749787d4318712d05556567c1f3222e85f0e8996b41b38994e001a8d DIST pydantic_core-2.18.4.tar.gz 385098 BLAKE2B 6bea502397c327f38a000e9ea3b59b7d7f9fde5336562a081c6cdf88d92fe5e420eecec696ee432f1c6c5ec5dad8173f250897c4ae681a367ad28617724843f0 SHA512 01bdf79a79468e2a6a66f41830b98dc0adfb6d87b221e57e1da5a27b4068dea906aa987b9a7eca3bdc107e97e6bfa9ea164c527bbe2ceb683419ef147747b786 DIST pydantic_core-2.19.0.tar.gz 385827 BLAKE2B 353c01dcef56709259e679d10d6b2397e5f90d4c734bbd31bfb6bddfd6011a2f74df4bcabb2a1a3f6a7ba9d0b54d693260d445d8ab6795e28185f7d66c823567 SHA512 779e31900ed80c922c7e168f1906795d5073f5aae86abd74af8cf54a53fc366504d42b6779665e59f0f29ea3f4005ed134403bbb5726f90b44b165118ce569bb -DIST pyo3-0.21.1.crate 503776 BLAKE2B a042478e4d4fbff9f40eac1b09c2a0fd4af54a751ca16d3bcbaaefc417ef88066c2cbf0cb758dcada9e36c378007081fb9ad0f6bb36afb2622fdf7b3ba36934e SHA512 6bf1c99b7c0c44ece16b3298f1090891cac2994e25730da8a82981f2296bc2d260b61df08897a2cd6c27c6e90deb70e4c08388fc70eeea6dea4b5cc451ed9598 DIST pyo3-0.21.2.crate 504574 BLAKE2B 1b8bf374d1b61e3e4bedce6344338126051a6d951ea87d258e5ed92d4c0e13b0202f2e7e56500277c54743dd16c9b4587f436cf2058567501c8a9ac7c6b6c17a SHA512 5f88cda423e82b62698a74ceaa31fc27e5c1f1d417928accddb2e00337d163fda622f774ae6e24c1cb73c467d6b01e9a2ba866e4454338b1fbfc892ae14ffc53 -DIST pyo3-build-config-0.21.1.crate 30540 BLAKE2B 4019892096ee02c25ec6484eb56da12990fc84be5c5173f524e88e8b18e5b1b113d0db1962aff44253519bd1b5f3d4f01512ba86441927c19b04911d8282a039 SHA512 9eb4fbef1015deb1d7a414181926b6b4e44acc2347379783f2fe28e212986e62bb7e36d214d3bed613e9f213a9882084af9012042d9047846f7f4948f64112de DIST pyo3-build-config-0.21.2.crate 30581 BLAKE2B 993c1f7f15124336b70570ed3949cc0873c2b883e81dd3a350f347cf014fb9a82d487197fdaf475989b727b7ee8d9a5511a72422f76126b8788c4f40831baed8 SHA512 8b6bedb31235de3dd95bca6e19ea4eb7752227ceb9f1c928c4df2b277df5ee443e5c262e448012e4e54e3104213db4d745c9c42f79ab3029dee68f48ec3a2795 -DIST pyo3-ffi-0.21.1.crate 66163 BLAKE2B 7d47e140d6e39d2622a77349c20466e9e161d3732b3df7a4fba258ac4b41b5bfa57e4af87dae8ab932a27c965bc9e3e10cd38195c9037cb78246e0ad10260fd1 SHA512 6d0f6d1c9d6af1255a1d709e1da6dee82c9948ddcd2c8b38c760e5fe23b6a65b050f030b46a38697aa82b5c1927fc9a20dff92cfabf1a03ca92099583a516c68 DIST pyo3-ffi-0.21.2.crate 66160 BLAKE2B 759622fa3a41bcdb48170983c4e194898415f8db16a7c57ace89a7945bd47374d9a14e5ecf24e80a178bde597cfa30d41f9e6617b458d365640bdbda048e6f6e SHA512 5cbc9dfb14569210776fd66341e77e61642a9920354251a65b91aa13a0fb1c373258d1a6b4f8feacdc4266d472193d8f20a6dd2cc180ccc3d43fb66237ae6d0d -DIST pyo3-macros-0.21.1.crate 7921 BLAKE2B 92e4323996bf6fce143d03597fb32caae16ba21591601712404d94a9bb15b37aec94b625bcc4bdb11d04876cad2a310bf41254e59285bda7719a9a27879a5e47 SHA512 4b0fdba474fec4ef4d143467425f1ad598be226a42c486adbf2d9c6dbdde8528a81222702962dd7ae63c79d3799048cb40a066d39cd538430d95b2135876ed45 DIST pyo3-macros-0.21.2.crate 7920 BLAKE2B 60ceb626fd1ffeca7e81ebc721bb4cfebd99bb708d48bbfdd296b250ed41471f82e8657715e1f58840423ac11d8c5a84a6107a7037affdea4e0c2cc561514ed7 SHA512 95335a55d57346107fdc7591d51e36aa0a985d6c44a875475a0ed52df25d33b21a7b922fdab0eed190da9708968e79f7cd50bc683b6d210eb068713a915ac7f4 -DIST pyo3-macros-backend-0.21.1.crate 57986 BLAKE2B 0ea13819dac723b1715a2bc3a7481a151cbcea477e7241d30791fb8d0459df375fd84229f5b2fd89e83ffae1f02f46fa20fc80bc86d5fea3fa878dd38092aebd SHA512 0529dded41726f51e51cb8f1967b8eb211814fa527fb7280e33a1e1f36e74b1b6b28e6a33041730f1edb8014239977f52095a2219cb606b519ab08e252884e2d DIST pyo3-macros-backend-0.21.2.crate 58088 BLAKE2B 05dd49983c8aeddc47cd94f6cd58f10e41ad6f4ec57006908cde4fe3edbcf6814058d7843a88c9dbeb0824f840ad3509414c52e47fffe5ad4b730f791c9a3f19 SHA512 f8488ba0a68f1ae20d053e2323d065f03b40c24231a50b05205b100e973ae50bc7bb9c25e4d37df56f4cfa73d2001655ce9685078d1017a4a90bd7945c01b833 DIST python3-dll-a-0.2.9.crate 66092 BLAKE2B 2c4baa31df7f55da8f1c6073525b4498bae7207ee38ef0eba4dbe58088609937a7d7b851c603ae62e5eb5361881e67a05d8c112d0a76aba5d99b13cdccd59d59 SHA512 1914d3ce67284f13551a4efefaeb9c11138fcca3d5082746282f64b7a36f732c6834766d981f27d862a61410eed09b3d281e0cab8cc1a46d424d04823ffaee35 DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2 DIST radium-0.7.0.crate 10906 BLAKE2B d576e0ea5c5287bcb6740cee3a3838b6ae4dfdef0ef05d34634b96dba5159e48260233db57a767c9e032fa5d9a5798361335cb19f7844f450113ece30ffbc51d SHA512 51e23cf52997b46c0018a94b0259b29d7bf33ddba19f6db406ca57ee5b1417d7e5f27dda3bb487d0099886011a97f238e8b3dd4d6c86e8464c0b471c1a7622a0 DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde -DIST regex-1.10.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b DIST regex-automata-0.4.5.crate 617406 BLAKE2B 21826731ed5439a12cdda5a1ef217dc3239a0884d038170855985bf830f2782bdf4dbfd1b1a8812812db3a2399dadf8c173e75db635dfabc97382fda0561bba3 SHA512 0e9681d5c4529d49ff2555b7b73cf234b1f321a7fc634beccdf76c2bce5094e8501403e8caee2b3a16ac299cbe4701d891f1efa380b54f9dc2d92bbacd4de611 DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728 @@ -65,7 +58,6 @@ DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eee DIST serde-1.0.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994 DIST serde_derive-1.0.203.crate 55867 BLAKE2B 1bc8aa96328bb83e4e4ff527b1df855bbcefd333f0c43c96d1e0b93f98a46273dd88a21653bccc8f517c4fc06d17b9b44332a963d024796e0a2c18a5bfecc824 SHA512 b2aeeab33395ac11ebdbd922fcdbda29f2592e7a20e78aef250713baf269cacf497271be7aa407f657aba33da132df0e035be046fef070f915f234097d1dd392 -DIST serde_json-1.0.114.crate 146986 BLAKE2B 229f0a8e2c0bc35435b49774fab9d4cec4e2323e85e2f97ccaa2a18277ecfb9cff9e9b165786e782cba043e9ac670717364b0f9c145254eefd74582b728f2186 SHA512 2c35cd0e29ee2af6046ce849b5854b82b90f402b51c04ea86b32ce7d67869736f17a4d028dd8245c31201036bcca7a1d3df11d842a92a45b0eaebd809687d436 DIST serde_json-1.0.116.crate 146790 BLAKE2B 20492ac3c431fd3666599f079383a9d945549e02357127a58acaa7011684ef0caca221a253218402ceff6956ee8a20cc41ca3394b25bb69669be75ab22b66a1e SHA512 d383de754b0a50cc4ab3e6378b758ebd6178ad32ebed80cb4e32a9d8e81d0c689585ee5cd35f12b376e488d25ecfaca659be943c9bb4104b63a1c4f9ded2f337 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679 DIST speedate-0.14.0.crate 31499 BLAKE2B e5a63d989feafcb5183e010a431976095bce6492817e0d163e8b0fe3d640e5ef87d11569e5094d788ad7cb113c2fe7b822cbf266027095fc6f2d61ba36e8d38e SHA512 55f8f9de2767e7a4aa8f355f9a781adb7c8fbef072393d13092afc9941dde4a1d706b02d908fc82cdffffa876a87e7a336340320908899774c83c76e743e1107 diff --git a/dev-python/pydantic-core/pydantic-core-2.18.2.ebuild b/dev-python/pydantic-core/pydantic-core-2.18.2.ebuild deleted file mode 100644 index a7cf6a2aed7e9..0000000000000 --- a/dev-python/pydantic-core/pydantic-core-2.18.2.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=maturin -PYTHON_COMPAT=( pypy3 python3_{10..12} ) - -CRATES=" - ahash@0.8.10 - aho-corasick@1.0.2 - autocfg@1.1.0 - base64@0.21.7 - bitflags@1.3.2 - cc@1.0.79 - cfg-if@1.0.0 - enum_dispatch@0.3.13 - equivalent@1.0.1 - form_urlencoded@1.2.1 - getrandom@0.2.10 - hashbrown@0.14.3 - heck@0.4.1 - idna@0.5.0 - indexmap@2.2.2 - indoc@2.0.4 - itoa@1.0.8 - jiter@0.2.1 - lexical-parse-float@0.8.5 - lexical-parse-integer@0.8.6 - lexical-util@0.8.5 - libc@0.2.147 - lock_api@0.4.10 - memchr@2.6.3 - memoffset@0.9.0 - num-bigint@0.4.4 - num-integer@0.1.45 - num-traits@0.2.16 - once_cell@1.18.0 - parking_lot@0.12.1 - parking_lot_core@0.9.8 - percent-encoding@2.3.1 - portable-atomic@1.6.0 - proc-macro2@1.0.76 - pyo3-build-config@0.21.1 - pyo3-ffi@0.21.1 - pyo3-macros-backend@0.21.1 - pyo3-macros@0.21.1 - pyo3@0.21.1 - python3-dll-a@0.2.9 - quote@1.0.35 - redox_syscall@0.3.5 - regex-automata@0.4.5 - regex-syntax@0.8.2 - regex@1.10.3 - rustversion@1.0.13 - ryu@1.0.14 - scopeguard@1.1.0 - serde@1.0.197 - serde_derive@1.0.197 - serde_json@1.0.114 - smallvec@1.13.2 - speedate@0.14.0 - static_assertions@1.1.0 - strum@0.25.0 - strum_macros@0.25.3 - strum_macros@0.26.1 - syn@2.0.48 - target-lexicon@0.12.9 - tinyvec@1.6.0 - tinyvec_macros@0.1.1 - unicode-bidi@0.3.13 - unicode-ident@1.0.10 - unicode-normalization@0.1.22 - unindent@0.2.3 - url@2.5.0 - uuid@1.7.0 - version_check@0.9.4 - wasi@0.11.0+wasi-snapshot-preview1 - windows-targets@0.48.1 - windows_aarch64_gnullvm@0.48.0 - windows_aarch64_msvc@0.48.0 - windows_i686_gnu@0.48.0 - windows_i686_msvc@0.48.0 - windows_x86_64_gnu@0.48.0 - windows_x86_64_gnullvm@0.48.0 - windows_x86_64_msvc@0.48.0 - zerocopy-derive@0.7.32 - zerocopy@0.7.32 -" - -inherit cargo distutils-r1 pypi - -DESCRIPTION="Core validation logic for pydantic written in Rust" -HOMEPAGE=" - https://github.com/pydantic/pydantic-core/ - https://pypi.org/project/pydantic-core/ -" -SRC_URI+=" - ${CARGO_CRATE_URIS} -" - -LICENSE="MIT" -# Dependent crate licenses -LICENSE+=" - Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016 - || ( Apache-2.0 Boost-1.0 ) -" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - >=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}] -" -BDEPEND=" - >=virtual/rust-1.70.0 - test? ( - >=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}] - >=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}] - >=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}] - >=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}] - >=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}] - >=dev-python/pytz-2022.7.1[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so" - -src_prepare() { - sed -i -e '/--benchmark/d' pyproject.toml || die - sed -i -e '/^strip/d' Cargo.toml || die - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_IGNORE=( - tests/benchmarks - ) - local EPYTEST_DESELECT=( - # TODO: recursion till segfault - tests/serializers/test_functions.py::test_recursive_call - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - rm -rf pydantic_core || die - # tests link to libpython, so they fail to link on pypy3 - [[ ${EPYTHON} != pypy3 ]] && cargo_src_test - epytest -p pytest_mock -p timeout -} From 36272aa317344639a746ee26079f3442c3a517bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 14 Jun 2024 14:10:15 +0200 Subject: [PATCH 04/18] dev-python/mypy: Remove old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/mypy/Manifest | 1 - dev-python/mypy/mypy-1.9.0.ebuild | 112 ------------------------------ 2 files changed, 113 deletions(-) delete mode 100644 dev-python/mypy/mypy-1.9.0.ebuild diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest index 07f452a7a8edc..93abb4a0dad8c 100644 --- a/dev-python/mypy/Manifest +++ b/dev-python/mypy/Manifest @@ -1,2 +1 @@ DIST mypy-1.10.0.gh.tar.gz 3062151 BLAKE2B ddc7354b2b62247387fd04b309c50d4ffa5c1b8af58873cc8787bd17c04069b528850bfb586925aa7df6634a65af6a1e951e4d6036d5bd0e688b8608980510bd SHA512 c936c299d9d4b6911505ef7b7df6f8d7344bd199a2d654e66467291f6e6ba4432dfa7aed5a504e6ec9518d9d53ac85f771e7b31dc6a72e06e79c443547bc2b66 -DIST mypy-1.9.0.gh.tar.gz 3029335 BLAKE2B 5329a95e5ac52933413a91bec2c8bd728451508b7ead880c7c4542bbe5d4cd4d2155c6d372d31a653af9a913de51d8e35d44c1dde193787ce8eaedd8d64d682d SHA512 aaa975b97e72f00a384a38fee190e39c6469b062a7083c76bb94bb7058ed38f713f65b96bb36a871a430633cab424a0f11e995868f867e2f7a13c4754ed96c89 diff --git a/dev-python/mypy/mypy-1.9.0.ebuild b/dev-python/mypy/mypy-1.9.0.ebuild deleted file mode 100644 index b9f21a0e93c7e..0000000000000 --- a/dev-python/mypy/mypy-1.9.0.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# 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..12} ) - -inherit distutils-r1 multiprocessing - -DESCRIPTION="Optional static typing for Python" -HOMEPAGE=" - https://www.mypy-lang.org/ - https://github.com/python/mypy/ - https://pypi.org/project/mypy/ -" -SRC_URI=" - https://github.com/python/mypy/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="+native-extensions" - -# stubgen collides with this package: https://bugs.gentoo.org/585594 -RDEPEND=" - !dev-util/stubgen - >=dev-python/psutil-4[${PYTHON_USEDEP}] - >=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}] - >=dev-python/mypy_extensions-1.0.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/tomli[${PYTHON_USEDEP}] - ' 3.10) -" -BDEPEND=" - native-extensions? ( - ${RDEPEND} - dev-python/types-psutil[${PYTHON_USEDEP}] - dev-python/types-setuptools[${PYTHON_USEDEP}] - ) - test? ( - >=dev-python/attrs-18.0[${PYTHON_USEDEP}] - >=dev-python/filelock-3.3.0[${PYTHON_USEDEP}] - >=dev-python/lxml-4.9.1[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -# frustratingly, mypyc produces non-deterministic output. If ccache is enabled it will be a waste of time, -# but simultaneously it might trash your system and fill up the cache with a giant wave of non-reproducible -# test files (https://github.com/mypyc/mypyc/issues/1014) -export CCACHE_DISABLE=1 - -src_compile() { - local -x MYPY_USE_MYPYC=$(usex native-extensions 1 0) - distutils-r1_src_compile -} - -python_test() { - local EPYTEST_DESELECT=( - # the majority of them require Internet (via pip) - mypy/test/testpep561.py - # known broken with assertions enabled - # https://github.com/python/mypy/issues/16043 - mypyc/test/test_run.py::TestRun::run-i64.test::testI64GlueMethodsAndInheritance - mypyc/test/test_run.py::TestRun::run-floats.test::testFloatOps - # these assume that types-docutils are not installed - mypy/test/testpythoneval.py::PythonEvaluationSuite::pythoneval.test::testIgnoreImportIfNoPython3StubAvailable - mypy/test/testpythoneval.py::PythonEvaluationSuite::pythoneval.test::testNoPython3StubAvailable - # TODO - mypy/test/meta/test_parse_data.py - mypy/test/meta/test_update_data.py - mypy/test/teststubtest.py::StubtestUnit::test_runtime_typing_objects - ) - case ${EPYTHON} in - python3.12) - EPYTEST_DESELECT+=( - # more assertions, sigh - mypyc/test/test_run.py::TestRun::run-bools.test::testBoolOps - mypyc/test/test_run.py::TestRun::run-i64.test::testI64BasicOps - mypyc/test/test_run.py::TestRun::run-i64.test::testI64DefaultArgValues - mypyc/test/test_run.py::TestRun::run-i64.test::testI64ErrorValuesAndUndefined - ) - ;; - esac - - # Some mypy/test/testcmdline.py::PythonCmdlineSuite tests - # fail with high COLUMNS values - local -x COLUMNS=80 - - # The tests depend on having in-source compiled extensions if you want to - # test those compiled extensions. Various crucial test dependencies aren't - # installed. Even pyproject.toml is needed because that's where pytest args - # are in. Hack them into the build directory and delete them afterwards. - # See: https://github.com/python/mypy/issues/16143 - local -x MYPY_TEST_PREFIX="${S}" - cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - cp -r "${S}"/{conftest.py,pyproject.toml} . || die - - local failed= - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - nonfatal epytest -n "$(makeopts_jobs)" --dist=worksteal || failed=1 - - rm conftest.py pyproject.toml || die - - [[ ${failed} ]] && die "epytest failed with ${EPYTHON}" -} From 65a7a6d64fc2363715759a9a4489b4176737c1d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 14 Jun 2024 14:13:43 +0200 Subject: [PATCH 05/18] dev-python/genshi: Enable py3.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/genshi/Manifest | 1 + dev-python/genshi/genshi-0.7.7.ebuild | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest index dde6ef2b77681..399f7510438b6 100644 --- a/dev-python/genshi/Manifest +++ b/dev-python/genshi/Manifest @@ -1 +1,2 @@ DIST Genshi-0.7.7.tar.gz 267206 BLAKE2B 0bad4b26fbfda27572e78f87af6093c87d738ad6fdf2beea5e8b0b21b3f5245a4e239bbfbad63e71e73f6588e7cae97f2b3bc7295fa30ad7a203a7ceff7074c9 SHA512 b0a3dee68523292f0672a180c5f2cfbdf48205d82286359b9fac9f668cbc2806c649d1e158d6fb8ead5b1cc5cd44eefe9d1cd79077f96925b8d24dd8e746b40f +DIST python-genshi-use-default-test-loader.patch 13491 BLAKE2B 1651cdb3130fb3fb4c7ba9ce9ea150710c7a60f9d31ab00a0a4cc7376fd833cff28b30530e0ca7ade5d036279d88c7e94130b8ff7facf826a27421a0568b483c SHA512 1bc94efc1721faae870f9201781bb3d380ed03144bb4a2d7ea058cb15ee1c0b948989597c9e665b085ebe9ef1cd116b2a2233d2ab19706a87fd42f25ba208560 diff --git a/dev-python/genshi/genshi-0.7.7.ebuild b/dev-python/genshi/genshi-0.7.7.ebuild index 09f46de231982..dbfe15afb4222 100644 --- a/dev-python/genshi/genshi-0.7.7.ebuild +++ b/dev-python/genshi/genshi-0.7.7.ebuild @@ -7,12 +7,19 @@ DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 PYPI_PN=${PN^} -PYTHON_COMPAT=( python3_{10..12} pypy3 ) +PYTHON_COMPAT=( python3_{10..13} pypy3 ) inherit distutils-r1 pypi DESCRIPTION="Python toolkit for stream-based generation of output for the web" -HOMEPAGE="https://genshi.edgewall.org/ https://pypi.org/project/Genshi/" +HOMEPAGE=" + https://genshi.edgewall.org/ + https://github.com/edgewall/genshi/ + https://pypi.org/project/Genshi/ +" +SRC_URI+=" + https://src.fedoraproject.org/rpms/python-genshi/raw/rawhide/f/python-genshi-use-default-test-loader.patch +" LICENSE="BSD" SLOT="0" @@ -29,6 +36,11 @@ BDEPEND=" ) " +PATCHES=( + # https://github.com/edgewall/genshi/issues/72 + "${DISTDIR}/python-genshi-use-default-test-loader.patch" +) + python_test() { "${EPYTHON}" -m unittest -v genshi.tests.suite || die } From 4f5790385b4da6485587070eedd5d27f56dbb070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 14 Jun 2024 14:15:29 +0200 Subject: [PATCH 06/18] dev-python/markdown-exec: Bump to 1.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/markdown-exec/Manifest | 1 + .../markdown-exec/markdown-exec-1.9.1.ebuild | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 dev-python/markdown-exec/markdown-exec-1.9.1.ebuild diff --git a/dev-python/markdown-exec/Manifest b/dev-python/markdown-exec/Manifest index e0bd3544806ec..d1ebbc13b74f7 100644 --- a/dev-python/markdown-exec/Manifest +++ b/dev-python/markdown-exec/Manifest @@ -1 +1,2 @@ DIST markdown_exec-1.8.2.tar.gz 23631 BLAKE2B 0f0a7bcbf09dd8731cd5f5cf062d2ef8ec4f3c40f6b93f714546b84649ff0c41f379a00127a5a1ec9ddf1d4963cffa83b0af5caeae0bfb6d5ca425fb3565c0c6 SHA512 80b2a1cef21798a403bb2add02ac218fdc009fa7dad8d887b2be8f56ea27be439213940c3196c4133862b538b08ee15f6129afd6cef4eb6eadf21bcfcc0cef1c +DIST markdown_exec-1.9.1.tar.gz 24932 BLAKE2B 1b9b9904f8f6d7cc58f643bb537f2b4b3fa07f86c809590284eda5a714a998238910ae1356d58c7aab8e472ebcbc0511965ac3951b17a568128eafd9a3d0c852 SHA512 8c89cbea29c821a8110fed1825cec215a772753fd2bef96c26beb91dd8af34c905eedd4101fbf99b427cf9b9b2b4de08d69769dba66ad9b16bc72f16bec92a48 diff --git a/dev-python/markdown-exec/markdown-exec-1.9.1.ebuild b/dev-python/markdown-exec/markdown-exec-1.9.1.ebuild new file mode 100644 index 0000000000000..a80628fef998d --- /dev/null +++ b/dev-python/markdown-exec/markdown-exec-1.9.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=pdm-backend +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Utilities to execute code blocks in Markdown files" +HOMEPAGE=" + https://pawamoy.github.io/markdown-exec/ + https://pypi.org/project/markdown-exec/ +" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv" +IUSE="ansi" + +RDEPEND=" + >=dev-python/pymdown-extensions-9[${PYTHON_USEDEP}] + ansi? ( + dev-python/pygments-ansi-color[${PYTHON_USEDEP}] + ) +" +BDEPEND=" + test? ( + dev-python/markupsafe[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest From 3e3b6279bd902e90032243148e7c96cc755afc6d Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Fri, 14 Jun 2024 14:12:00 +0200 Subject: [PATCH 07/18] Revert "java-utils-2.eclass: eerror if java-utils-2 is inherited directly" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 41faa907e3a36f4ed00aced3499d469abb865281. Bug: https://bugs.gentoo.org/207098 Signed-off-by: Volkmar W. Pogatzki Closes: https://github.com/gentoo/gentoo/pull/37156 Signed-off-by: Miroslav Šulc --- eclass/java-utils-2.eclass | 6 ------ 1 file changed, 6 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index b72a00b352d29..adbc5242053ad 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -34,12 +34,6 @@ export WANT_JAVA_CONFIG="2" has test ${JAVA_PKG_IUSE} && RESTRICT+=" !test? ( test )" -# this eclass must be inherited after java-pkg-2 or java-pkg-opt-2 -# bug #207098 -if ! has java-pkg-2 ${INHERITED} && ! has java-pkg-opt-2 ${INHERITED}; then - eerror "java-utils-2 eclass must not be inherited directly." -fi - # @VARIABLE: JAVA_PKG_E_DEPEND # @INTERNAL # @DESCRIPTION: From a3266609c65361d1dc2e7c1be9c91721c899750a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 1 Jun 2024 11:09:37 +0200 Subject: [PATCH 08/18] distutils-r1.eclass: Remove doc for DOCS, HTML_DOCS and PATCHES MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the redundant (and outdated) documentation for the DOCS, HTML_DOCS and PATCHES variables. All these variables are handled through the default EAPI functions. Closes: https://bugs.gentoo.org/932802 Signed-off-by: Michał Górny --- eclass/distutils-r1.eclass | 46 -------------------------------------- 1 file changed, 46 deletions(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 71b80fafe1a55..eac4d592efafc 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -364,52 +364,6 @@ _distutils_set_globals() { _distutils_set_globals unset -f _distutils_set_globals -# @ECLASS_VARIABLE: PATCHES -# @DEFAULT_UNSET -# @DESCRIPTION: -# An array containing patches to be applied to the sources before -# copying them. -# -# If unset, no custom patches will be applied. -# -# Please note, however, that at some point the eclass may apply -# additional distutils patches/quirks independently of this variable. -# -# Example: -# @CODE -# PATCHES=( "${FILESDIR}"/${P}-make-gentoo-happy.patch ) -# @CODE - -# @ECLASS_VARIABLE: DOCS -# @DEFAULT_UNSET -# @DESCRIPTION: -# An array containing documents installed using dodoc. The files listed -# there must exist in the directory from which -# distutils-r1_python_install_all() is run (${S} by default). -# -# If unset, the function will instead look up files matching default -# filename pattern list (from the Package Manager Specification), -# and install those found. -# -# Example: -# @CODE -# DOCS=( NEWS README ) -# @CODE - -# @ECLASS_VARIABLE: HTML_DOCS -# @DEFAULT_UNSET -# @DESCRIPTION: -# An array containing documents installed using dohtml. The files -# and directories listed there must exist in the directory from which -# distutils-r1_python_install_all() is run (${S} by default). -# -# If unset, no HTML docs will be installed. -# -# Example: -# @CODE -# HTML_DOCS=( doc/html/. ) -# @CODE - # @ECLASS_VARIABLE: DISTUTILS_IN_SOURCE_BUILD # @DEFAULT_UNSET # @DESCRIPTION: From d344e223068c8d9eb695ba464facb4451bb07d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 1 Jun 2024 11:14:26 +0200 Subject: [PATCH 09/18] distutils-r1.eclass: Doc DISTUTILS_OPTIONAL + DISTUTILS_SINGLE_IMPL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/780807 Signed-off-by: Michał Górny --- eclass/distutils-r1.eclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index eac4d592efafc..392725d48121a 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -78,6 +78,11 @@ esac # for your package (using ${PYTHON_DEPS}) and to either call # distutils-r1 default phase functions or call the build system # manually. +# +# Note that if DISTUTILS_SINGLE_IMPL is used, python-single-r1 exports +# pkg_setup() function. In that case, it is necessary to redefine +# pkg_setup() to call python-single-r1_pkg_setup over correct +# conditions. # @ECLASS_VARIABLE: DISTUTILS_SINGLE_IMPL # @DEFAULT_UNSET From f5102bba40a66015d03da8f20387c0f9f40d56f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 1 Jun 2024 11:17:46 +0200 Subject: [PATCH 10/18] distutils-r1.eclass: Doc DISTUTILS_IN_SOURCE_BUILD as deprecated MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- eclass/distutils-r1.eclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 392725d48121a..2b610a4d2ceb3 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -371,6 +371,7 @@ unset -f _distutils_set_globals # @ECLASS_VARIABLE: DISTUTILS_IN_SOURCE_BUILD # @DEFAULT_UNSET +# @DEPRECATED: (none) # @DESCRIPTION: # If set to a non-null value, in-source builds will be enabled. # If unset, the default is to use in-source builds when python_prepare() @@ -384,6 +385,9 @@ unset -f _distutils_set_globals # on the sources directly, prepending setup.py arguments with # 'build --build-base ${BUILD_DIR}' to enforce keeping & using built # files in the specific root. +# +# In-source builds are deprecated and no longer supported in PEP517 +# mode. # @ECLASS_VARIABLE: DISTUTILS_ALL_SUBPHASE_IMPLS # @DEFAULT_UNSET From 4c9973d691bf1842f7a1fcefc90e31872054bc94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 1 Jun 2024 11:22:32 +0200 Subject: [PATCH 11/18] distutils-r1.eclass: Document BUILD_DIR for consistency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/910661 Signed-off-by: Michał Górny --- eclass/distutils-r1.eclass | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 2b610a4d2ceb3..3d72a5d3d5540 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -206,6 +206,22 @@ esac # the build system in pure Python packages and packages using the stable # Python ABI. +# @ECLASS_VARIABLE: BUILD_DIR +# @OUTPUT_VARIABLE +# @DEFAULT_UNSET +# @DESCRIPTION: +# The current build directory. In global scope, it is supposed to +# contain an initial build directory; if unset, it defaults to ${S}. +# +# When running in multi-impl mode, the BUILD_DIR variable is set +# by python-r1.eclass. Otherwise, it is set by distutils-r1.eclass +# for consistency. +# +# Example value: +# @CODE +# ${WORKDIR}/foo-1.3-python3_12 +# @CODE + if [[ -z ${_DISTUTILS_R1_ECLASS} ]]; then _DISTUTILS_R1_ECLASS=1 From 75da06793abc7dc2dc5fc0faec81fad7c56d9d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 2 Jun 2024 19:59:01 +0200 Subject: [PATCH 12/18] distutils-r1.eclass: Remove support for `d_e_t --install` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- eclass/distutils-r1.eclass | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 3d72a5d3d5540..f0d9d3a4b9371 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -566,7 +566,7 @@ distutils_enable_sphinx() { } # @FUNCTION: distutils_enable_tests -# @USAGE: [--install] +# @USAGE: # @DESCRIPTION: # Set up IUSE, RESTRICT, BDEPEND and python_test() for running tests # with the specified test runner. Also copies the current value @@ -578,10 +578,6 @@ distutils_enable_sphinx() { # # - unittest: for built-in Python unittest module # -# Additionally, if --install is passed as the first parameter, -# 'distutils_install_for_testing --via-root' is called before running -# the test suite. -# # This function is meant as a helper for common use cases, and it only # takes care of basic setup. You still need to list additional test # dependencies manually. If you have uncommon use case, you should @@ -592,14 +588,9 @@ distutils_enable_sphinx() { distutils_enable_tests() { debug-print-function ${FUNCNAME} "${@}" - _DISTUTILS_TEST_INSTALL= case ${1} in --install) - if [[ ${DISTUTILS_USE_PEP517} ]]; then - die "${FUNCNAME} --install is not implemented in PEP517 mode" - fi - _DISTUTILS_TEST_INSTALL=1 - shift + die "${FUNCNAME} --install is no longer supported" ;; esac @@ -1679,10 +1670,6 @@ distutils-r1_python_test() { _python_check_EPYTHON - if [[ ${_DISTUTILS_TEST_INSTALL} ]]; then - distutils_install_for_testing - fi - case ${_DISTUTILS_TEST_RUNNER} in pytest) epytest From 941e9c718887243f880ee6f8271c5e6d9aeb75db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 2 Jun 2024 20:01:26 +0200 Subject: [PATCH 13/18] distutils-r1.eclass: Remove distutils_install_for_testing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove `distutils_install_for_testing` function. It is quite complex, and it was used only in the legacy eclass mode. All ebuilds using it in ::gentoo have been migrated to PEP517 build already, and the PEP517 build implement the same functionality better. Signed-off-by: Michał Górny --- eclass/distutils-r1.eclass | 123 ++----------------------------------- 1 file changed, 5 insertions(+), 118 deletions(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index f0d9d3a4b9371..afed1fa547d1e 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -704,123 +704,12 @@ esetup.py() { } # @FUNCTION: distutils_install_for_testing -# @USAGE: [--via-root|--via-home|--via-venv] [...] +# @DEPRECATED: DISTUTILS_USE_PEP517=... # @DESCRIPTION: -# Install the package into a temporary location for running tests. -# Update PYTHONPATH appropriately and set TEST_DIR to the test -# installation root. The Python packages will be installed in 'lib' -# subdir, and scripts in 'scripts' subdir (like in BUILD_DIR). -# -# Please note that this function should be only used if package uses -# namespaces (and therefore proper install needs to be done to enforce -# PYTHONPATH) or tests rely on the results of install command. -# For most of the packages, tests built in BUILD_DIR are good enough. -# -# The function supports three install modes. These are: -# -# --via-root (the default) that uses 'setup.py install --root=...' -# combined with PYTHONPATH and is recommended for the majority -# of packages. -# -# --via-venv that creates a (non-isolated) venv and installs the package -# into it via 'setup.py install'. This mode does not use PYTHONPATH -# but requires python to be called via PATH. It may solve a few corner -# cases that --via-root do not support. -# -# --via-home that uses 'setup.py install --home=...'. This is -# a historical mode that was mostly broken by setuptools 50.3.0+. -# If your package does not work with the other two modes but works with -# this one, please report a bug. -# -# Please note that in order to test the solution properly you need -# to unmerge the package first. -# -# This function is not available in PEP517 mode. The eclass provides -# a venv-style install unconditionally and therefore it should no longer -# be necessary. +# This function used to provide an installed package for running tests. +# It is no longer implemented, PEP517 mode must be used instead. distutils_install_for_testing() { - debug-print-function ${FUNCNAME} "${@}" - - if [[ ${DISTUTILS_USE_PEP517} ]]; then - die "${FUNCNAME} is not implemented in PEP517 mode" - fi - - # A few notes about --via-home mode: - # 1) 'install --home' is terribly broken on pypy, so we need - # to override --install-lib and --install-scripts, - # 2) non-root 'install' complains about PYTHONPATH and missing dirs, - # so we need to set it properly and mkdir them, - # 3) it runs a bunch of commands which write random files to cwd, - # in order to avoid that, we add the necessary path overrides - # in _distutils-r1_create_setup_cfg. - - local install_method=root - case ${1} in - --via-home) - [[ ${EAPI} == 7 ]] || die "${*} is banned in EAPI ${EAPI}" - install_method=home - shift - ;; - --via-root) - install_method=root - shift - ;; - --via-venv) - install_method=venv - shift - ;; - esac - - TEST_DIR=${BUILD_DIR}/test - local add_args=() - - if [[ ${install_method} == venv ]]; then - # create a quasi-venv - mkdir -p "${TEST_DIR}"/bin || die - ln -s "${PYTHON}" "${TEST_DIR}/bin/${EPYTHON}" || die - ln -s "${EPYTHON}" "${TEST_DIR}/bin/python3" || die - ln -s "${EPYTHON}" "${TEST_DIR}/bin/python" || die - cat > "${TEST_DIR}"/pyvenv.cfg <<-EOF || die - include-system-site-packages = true - EOF - - # we only do the minimal necessary subset of activate script - PATH=${TEST_DIR}/bin:${PATH} - # unset PYTHONPATH in order to prevent BUILD_DIR from overriding - # venv packages - unset PYTHONPATH - - # force root-style install (note: venv adds TEST_DIR to prefixes, - # so we need to pass --root=/) - add_args=( - --root=/ - ) - else - local bindir=${TEST_DIR}/scripts - local libdir=${TEST_DIR}/lib - PATH=${bindir}:${PATH} - PYTHONPATH=${libdir}:${PYTHONPATH} - - case ${install_method} in - home) - add_args=( - --home="${TEST_DIR}" - --install-lib="${libdir}" - --install-scripts="${bindir}" - ) - mkdir -p "${libdir}" || die - ;; - root) - add_args=( - --root="${TEST_DIR}" - --install-lib=lib - --install-scripts=scripts - ) - ;; - esac - fi - - esetup.py install "${add_args[@]}" "${@}" + die "${FUNCNAME} has been removed, please use PEP517 mode instead" } # @FUNCTION: distutils_write_namespace @@ -1859,9 +1748,7 @@ distutils-r1_run_phase() { else local -x PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}" - # make PATH local for distutils_install_for_testing calls - # it makes little sense to let user modify PATH in per-impl phases - # and _all() already localizes it + # make PATH local (for historical reasons) local -x PATH=${PATH} if _python_impl_matches "${EPYTHON}" 3.{9..11}; then From 030257a29d8a9900668ba0b57a21250ab600d232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 3 Jun 2024 03:00:14 +0200 Subject: [PATCH 14/18] distutils-r1.eclass: Change "PEP 517" to "PEP517", for consistency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- eclass/distutils-r1.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index afed1fa547d1e..61c0a80323ec5 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -99,7 +99,7 @@ esac # @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: -# Enable the PEP 517 mode for the specified build system. In this mode, +# Enable the PEP517 mode for the specified build system. In this mode, # the complete build and install is done in python_compile(), # a venv-style install tree is provided to python_test(), # and python_install() just merges the temporary install tree @@ -182,7 +182,7 @@ esac # This is an eclass-generated build-time dependency string for the build # system packages. This string is automatically appended to BDEPEND # unless DISTUTILS_OPTIONAL is used. This variable is available only -# in PEP 517 mode. +# in PEP517 mode. # # Example use: # @CODE @@ -1221,7 +1221,7 @@ distutils_wheel_install() { # @FUNCTION: distutils_pep517_install # @USAGE: # @DESCRIPTION: -# Build the wheel for the package in the current directory using PEP 517 +# Build the wheel for the package in the current directory using PEP517 # backend and install it into . # # This function is intended for expert use only. It does not handle From 8c7703e917f8ff61c4fa7881ef664eb9054c23d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 10 Jun 2024 20:58:16 +0200 Subject: [PATCH 15/18] python-r1.eclass: Override PYTHON*_USEDEP in sub-phases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Override the value of PYTHON_USEDEP and PYTHON_SINGLE_USEDEP to match the current implementation inside sub-phase function. This makes it possible to use them in has_version checks with conditional dependencies. Signed-off-by: Michał Górny --- eclass/python-r1.eclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index fbc6082a1d925..c5fa6770558f2 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -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 # @ECLASS: python-r1.eclass @@ -594,6 +594,8 @@ _python_multibuild_wrapper() { local -x EPYTHON PYTHON local -x PATH=${PATH} PKG_CONFIG_PATH=${PKG_CONFIG_PATH} + local PYTHON_USEDEP="python_targets_${MULTIBUILD_VARIANT}(-)" + local PYTHON_SINGLE_USEDEP="python_single_target_${MULTIBUILD_VARIANT}(-)" _python_export "${MULTIBUILD_VARIANT}" EPYTHON PYTHON _python_wrapper_setup From 049e44c74868d28da962550c3fd1712ab34ebbfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 10 Jun 2024 21:00:17 +0200 Subject: [PATCH 16/18] app-containers/docker-compose: Remove old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../docker-compose-1.29.2-r3.ebuild | 73 ------------------- .../docker-compose-1.29.2-r5.ebuild | 73 ------------------- 2 files changed, 146 deletions(-) delete mode 100644 app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild delete mode 100644 app-containers/docker-compose/docker-compose-1.29.2-r5.ebuild diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild deleted file mode 100644 index ee0767eba7071..0000000000000 --- a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2018-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit bash-completion-r1 distutils-r1 - -MY_PV=${PV/_/-} -DESCRIPTION="Multi-container orchestration for Docker" -HOMEPAGE="https://github.com/docker/compose" -SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64" - -RDEPEND=" - >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] - =dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] - >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] - >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}] - >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] - >=dev-python/requests-2.20.0[${PYTHON_USEDEP}] - >=dev-python/six-1.3.0[${PYTHON_USEDEP}] - >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}] - >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" - -DEPEND="${RDEPEND} - test? ( - >=dev-python/pytest-5[${PYTHON_USEDEP}] - >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}] - dev-python/py[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}/compose-${MY_PV}" - -distutils_enable_tests pytest - -PATCHES=( - # Bug #679968 -- https://bugs.gentoo.org/679968 - # Bug #681002 -- https://bugs.gentoo.org/681002 - "${FILESDIR}"/${PN}-1.29.0-setup-py.patch - "${FILESDIR}"/${P}-tests-unit-cli-test-py.patch -) - -DOCS=( CHANGELOG.md README.md ) - -src_prepare() { - # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command." - sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die - - default -} - -python_test() { - distutils_install_for_testing - epytest tests/unit/ -} - -python_install_all() { - newbashcomp contrib/completion/bash/docker-compose ${PN} - - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - - distutils-r1_python_install_all -} diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r5.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r5.ebuild deleted file mode 100644 index 65f0ca25d5a48..0000000000000 --- a/app-containers/docker-compose/docker-compose-1.29.2-r5.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2018-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 bash-completion-r1 distutils-r1 - -MY_PV=${PV/_/-} -DESCRIPTION="Multi-container orchestration for Docker" -HOMEPAGE="https://github.com/docker/compose" -SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64" - -RDEPEND=" - >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] - =dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] - >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] - >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}] - >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] - >=dev-python/requests-2.20.0[${PYTHON_USEDEP}] - >=dev-python/six-1.3.0[${PYTHON_USEDEP}] - >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}] - >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" - -DEPEND="${RDEPEND} - test? ( - >=dev-python/pytest-5[${PYTHON_USEDEP}] - >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}] - dev-python/py[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}/compose-${MY_PV}" - -distutils_enable_tests pytest - -PATCHES=( - # Bug #679968 -- https://bugs.gentoo.org/679968 - # Bug #681002 -- https://bugs.gentoo.org/681002 - "${FILESDIR}"/${PN}-1.29.0-setup-py.patch - "${FILESDIR}"/${P}-tests-unit-cli-test-py.patch -) - -DOCS=( CHANGELOG.md README.md ) - -src_prepare() { - # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command." - sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die - - default -} - -python_test() { - epytest tests/unit/ -} - -python_install_all() { - newbashcomp contrib/completion/bash/docker-compose ${PN} - - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - - distutils-r1_python_install_all -} From 55af9ca9d8d911f0046c65366453e99f80c97aca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 10 Jun 2024 21:00:49 +0200 Subject: [PATCH 17/18] dev-util/gcovr: Remove old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-util/gcovr/Manifest | 2 -- dev-util/gcovr/gcovr-5.1.ebuild | 48 -------------------------------- dev-util/gcovr/gcovr-5.2.ebuild | 49 --------------------------------- 3 files changed, 99 deletions(-) delete mode 100644 dev-util/gcovr/gcovr-5.1.ebuild delete mode 100644 dev-util/gcovr/gcovr-5.2.ebuild diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest index a51fbef99dc71..21af1035f2c29 100644 --- a/dev-util/gcovr/Manifest +++ b/dev-util/gcovr/Manifest @@ -1,4 +1,2 @@ -DIST gcovr-5.1.tar.gz 1676960 BLAKE2B 106c30c7e349f8ffa7a9c52d70e59c32799a8def11986027e3b794ada07fc11ab27b322c377b553f4bb96ca8662bf152eeb7de2d1913381e6068123d2430aa6c SHA512 ae2f0d9ad04f2dc851db9bc99a30a5dc1b1f43dbc6336422ecf5228d37f6994406a83e50f1ee6b5c8d6ec6d7b9e2bba726fd3d502dc5022fe359d480e6d267a5 -DIST gcovr-5.2.tar.gz 1381017 BLAKE2B 8dcd7eb5d482f2020eb29da74e215f0b7731654a66b4ca6d0d919ad6b7eebe564c211a8ec5c4ef87efd61e7c18bfa524aae56d653522f23e4bb902a3921f9522 SHA512 d1a4dd63129ac1d2b9a892ced9b4a0644dc49dc3a115d81ddf348e43fea0e7809c6533104106da8f89a666a4af9ff5a62429b4270ff2272ca61bbebecb7fb921 DIST gcovr-6.0.tar.gz 1054940 BLAKE2B 1947950d06926cf48d456e6bc389db46cfe4c7ed0395da1ebdb75aa1ea4b85f3cea536d77a4ddca5621885daaaf54462160592a5a384247f12ad3ed5c299b0b7 SHA512 3b4d30417b5000d2d28bc156dc9db43ba62cf8756aa5a9619391457d0042dc8eaf1743c5defdaabffb6b423bf2fcf8172b3e6c8795419758abc1acf4853de4bb DIST gcovr-7.2.gh.tar.gz 2800014 BLAKE2B e334688f129868d9affe0fa5c5280eb7dd4c57825bec31f32d529c579f622e7c60985f8aad506bd714ebe00c47fd61b673ad2352e51a0fd8175777bb6a1c93e7 SHA512 fc4acbfeef48866c5c8884681375069c7308a86aaefe5b36e631240a96dcdc7c56b3e8d0c221f66dbbe29302b549c5c9b9c5e01bbf4103165b085ae33c369f55 diff --git a/dev-util/gcovr/gcovr-5.1.ebuild b/dev-util/gcovr/gcovr-5.1.ebuild deleted file mode 100644 index 800f3c5bfb296..0000000000000 --- a/dev-util/gcovr/gcovr-5.1.ebuild +++ /dev/null @@ -1,48 +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} ) -DISTUTILS_IN_SOURCE_BUILD=1 - -inherit distutils-r1 - -DESCRIPTION="A Python script for summarizing gcov data" -HOMEPAGE="https://github.com/gcovr/gcovr" -SRC_URI="https://github.com/gcovr/gcovr/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/pytest-timeout[${PYTHON_USEDEP}] - ) -" - -# tests fail on gcc newer than 5.8 -#RESTRICT="test" - -distutils_enable_tests pytest - -python_test() { - distutils_install_for_testing - - local -x PATH="${TEST_DIR}/scripts:${PATH}" \ - PYTHONPATH="${TEST_DIR}/lib" - - local deselect=( - # those tests fail on gcc newer than 5.8 - # https://github.com/gcovr/gcovr/issues/206 - gcovr/tests/test_gcovr.py - ) - - epytest gcovr ${deselect[@]/#/--deselect } -} diff --git a/dev-util/gcovr/gcovr-5.2.ebuild b/dev-util/gcovr/gcovr-5.2.ebuild deleted file mode 100644 index 40e2208a9e4fa..0000000000000 --- a/dev-util/gcovr/gcovr-5.2.ebuild +++ /dev/null @@ -1,49 +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} ) -DISTUTILS_IN_SOURCE_BUILD=1 - -inherit distutils-r1 - -DESCRIPTION="A Python script for summarizing gcov data" -HOMEPAGE="https://github.com/gcovr/gcovr" -SRC_URI="https://github.com/gcovr/gcovr/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~loong ~x86" - -RDEPEND=" - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/yaxmldiff[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/pytest-timeout[${PYTHON_USEDEP}] - ) -" - -# tests fail on gcc newer than 5.8 -#RESTRICT="test" - -distutils_enable_tests pytest - -python_test() { - distutils_install_for_testing - - local -x PATH="${TEST_DIR}/scripts:${PATH}" \ - PYTHONPATH="${TEST_DIR}/lib" - - local deselect=( - # those tests fail on gcc newer than 5.8 - # https://github.com/gcovr/gcovr/issues/206 - gcovr/tests/test_gcovr.py - ) - - epytest gcovr ${deselect[@]/#/--deselect } -} From 3d5e312303630c1b76224f20a6c64c01b3da181f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 11 Jun 2024 05:04:43 +0200 Subject: [PATCH 18/18] x11-wm/xpra: Remove old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny Closes: https://github.com/gentoo/gentoo/pull/36945 Signed-off-by: Michał Górny --- x11-wm/xpra/Manifest | 1 - x11-wm/xpra/xpra-4.4.5-r2.ebuild | 221 ------------------------------- 2 files changed, 222 deletions(-) delete mode 100644 x11-wm/xpra/xpra-4.4.5-r2.ebuild diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest index fb6136d149d39..54e1c35b2dd27 100644 --- a/x11-wm/xpra/Manifest +++ b/x11-wm/xpra/Manifest @@ -1,3 +1,2 @@ -DIST xpra-4.4.5.tar.gz 4332287 BLAKE2B 64165a18d0f204247f984f616438252e82922447441376e6e46a15509486e67f699e852562cd632591fd2831a86592d5029c5905932fc9d267b16a7e6edd1b5a SHA512 6fb28328efc020969fff17bf747a1e0bf5b21869c9532a8c482e12f979d1dec7989e10e5bf3a9ae7dbfaa9e48c670255b196fdb819200a74dfbdec3ba5ae744f DIST xpra-4.4.6.tar.gz 4334932 BLAKE2B 0518c6807be85777bb67b0a3283a610c06a97813671bff6edc701533aaa8f26b96e423e56ba56491ede120697277f6935ee26976b49550dfd2d52bbcd2daebd8 SHA512 273ee959647c1281f18c7b1b24d3a5179c4b6ce81515cc34618c698e55bdc2a8e94f0e236d7ab41c7bf29fa7fde0b1a2a1432445b8aaaa0a75cd5a90f4858419 DIST xpra-6.0.1.tar.gz 17214848 BLAKE2B 81a26cd9aa9a61241ba47bc6712cd225499a82a8743c4f5655f4529d525788789452daaa0894a2cb9292caa7fd9aa64f82ce5b347c9c168815198e18145629b9 SHA512 3520dec19bb6999fc19ffcd3c385545f4a61f7cf50d4d6930eb39dec1341c79f6c4c8c45d526f43b33ed78d5359524103fcf1608dc705b40e330a7eb53de2475 diff --git a/x11-wm/xpra/xpra-4.4.5-r2.ebuild b/x11-wm/xpra/xpra-4.4.5-r2.ebuild deleted file mode 100644 index 2069b11904d45..0000000000000 --- a/x11-wm/xpra/xpra-4.4.5-r2.ebuild +++ /dev/null @@ -1,221 +0,0 @@ -# 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/Xpra-org/xpra.git" - inherit git-r3 -else - inherit pypi - KEYWORDS="amd64 x86" -fi - -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_SINGLE_IMPL=yes -DISTUTILS_USE_SETUPTOOLS=no -DISTUTILS_EXT=1 - -inherit xdg distutils-r1 tmpfiles udev - -DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" -HOMEPAGE="https://xpra.org/" -LICENSE="GPL-2 BSD" -SLOT="0" -IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal oauth opengl pinentry pulseaudio +server sound systemd test +trayicon udev vpx webcam webp xdg xinerama" -IUSE+=" +python_single_target_python3_11" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - || ( client server ) - cups? ( dbus ) - oauth? ( server ) - opengl? ( client ) - test? ( client clipboard crypt dbus html server sound xdg xinerama ) -" - -TEST_DEPEND=" - $(python_gen_cond_dep ' - dev-python/netifaces[${PYTHON_USEDEP}] - dev-python/pillow[jpeg?,${PYTHON_USEDEP}] - dev-python/rencode[${PYTHON_USEDEP}] - dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) - xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] ) - ') - html? ( www-apps/xpra-html5 ) - server? ( - x11-base/xorg-server[-minimal,xvfb] - x11-drivers/xf86-input-void - ) - xinerama? ( x11-libs/libfakeXinerama ) -" -DEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP},cairo] - opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) - sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) - ') - x11-libs/gtk+:3[introspection] - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXres - x11-libs/libXtst - x11-libs/libxkbfile - brotli? ( app-arch/brotli ) - csc? ( >=media-video/ffmpeg-1.2.2:0= ) - ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] ) - jpeg? ( media-libs/libjpeg-turbo ) - pulseaudio? ( - media-libs/libpulse - media-plugins/gst-plugins-pulse:1.0 - ) - sound? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - vpx? ( media-libs/libvpx media-video/ffmpeg ) - webp? ( media-libs/libwebp ) -" -RDEPEND=" - ${DEPEND} - ${TEST_DEPEND} - $(python_gen_cond_dep ' - crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] ) - cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) - lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) - lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) - oauth? ( dev-python/oauthlib[${PYTHON_USEDEP}] ) - opengl? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) - webcam? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - media-libs/opencv[${PYTHON_USEDEP},python] - ) - ') - acct-group/xpra - virtual/ssh - x11-apps/xauth - x11-apps/xmodmap - ibus? ( app-i18n/ibus ) - pinentry? ( app-crypt/pinentry ) - trayicon? ( dev-libs/libayatana-appindicator ) - udev? ( virtual/udev ) -" -DEPEND+=" - test? ( ${TEST_DEPEND} ) -" -BDEPEND=" - $(python_gen_cond_dep ' - >=dev-python/cython-0.16[${PYTHON_USEDEP}] - ') - virtual/pkgconfig - doc? ( virtual/pandoc ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.4-xdummy.patch -) - -python_prepare_all() { - distutils-r1_python_prepare_all - - # FIXME: There are hardcoded paths all over the place but the following - # double-prefixes some files under /etc. Looks tricky to fix. :( - #hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \)) - - sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \ - -i setup.py || die - - if use minimal; then - sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \ - -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \ - -i setup.py || die - fi -} - -python_configure_all() { - sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ - -i setup.py || die - - DISTUTILS_ARGS=( - --without-PIC - --without-Xdummy - $(use_with client) - $(use_with clipboard) - $(use_with csc csc_swscale) - --without-csc_libyuv - --without-cuda_rebuild - --without-cuda_kernels - $(use_with cups printing) - --without-debug - $(use_with dbus) - $(use_with doc docs) - $(use_with ffmpeg dec_avcodec2) - $(use_with ffmpeg enc_ffmpeg) - $(use_with ffmpeg enc_x264) - --without-enc_x265 - --with-gtk3 - $(use_with jpeg jpeg_encoder) - $(use_with jpeg jpeg_decoder) - --without-mdns - --without-sd_listen - --without-service - $(use_with opengl) - $(use_with server shadow) - $(use_with server) - $(use_with sound) - --without-strict - $(use_with vpx) - --with-warn - $(use_with webcam) - $(use_with webp) - --with-x11 - ) - - export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra" -} - -python_test() { - export XAUTHORITY=${HOME}/.Xauthority - touch "${XAUTHORITY}" || die - - distutils_install_for_testing - xdg_environment_reset - - env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \ - PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \ - XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \ - "${PYTHON}" "${S}"/tests/unittests/unit/run.py || die -} - -python_install_all() { - distutils-r1_python_prepare_all - - # Move udev dir to the right place if necessary. - if use udev; then - local dir=$(get_udevdir) - if [[ ! ${ED}/usr/lib/udev -ef ${ED}${dir} ]]; then - dodir "${dir%/*}" - mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die - fi - else - rm -vr "${ED}"/usr/lib/udev || die - rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || die - fi -} - -pkg_postinst() { - tmpfiles_process xpra.conf - xdg_pkg_postinst - use udev && udev_reload -} - -pkg_postrm() { - xdg_pkg_postinst - use udev && udev_reload -}