diff --git a/Manifest.files.gz b/Manifest.files.gz index 4dd074fcc236..2a8a63d2bede 100644 Binary files a/Manifest.files.gz and b/Manifest.files.gz differ diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz index a695a60a6632..58a4a674e38e 100644 Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ diff --git a/app-accessibility/accerciser/Manifest b/app-accessibility/accerciser/Manifest index 961c772d3b4e..b3f4b577c1ef 100644 --- a/app-accessibility/accerciser/Manifest +++ b/app-accessibility/accerciser/Manifest @@ -1,2 +1 @@ -DIST accerciser-3.40.0.tar.xz 1991256 BLAKE2B adcaa37b64d91cf4348fdd1b15d22aa977585c2c9d3ad81b41c7711f82ce010c7b75a44de6ec780fbbdadacad856a1f15b4f492971f5a7acfcea0568f0edc2df SHA512 78a7ce4a69de9a237c75b8df25665c8e9e8173969fb146cb608f4b51ff042c3abdcd49225f8f420c1c1bfab3736a8607eb6b555106c8a1e6e3399c83bad8f198 DIST accerciser-3.42.0.tar.xz 1999644 BLAKE2B 190f37ab94aba2dd1f16594242426a33bac366b89eb284c739c02a96cf0330ccb562237079d79ade5b729c5e38facbb542af2ace195a5d9b6d1c68a5005ba653 SHA512 65c3819c80c9ec3c8728963572a2c7bb4575782abde8ee34e3b7fa31217ef0e8106a7702c5b5a32b123ccb84b357984844a6d4aee75bf7e6157f3d63588224da diff --git a/app-accessibility/accerciser/accerciser-3.40.0.ebuild b/app-accessibility/accerciser/accerciser-3.40.0.ebuild deleted file mode 100644 index 376e8ee4db01..000000000000 --- a/app-accessibility/accerciser/accerciser-3.40.0.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} ) -PYTHON_REQ_USE="xml(+)" - -inherit gnome2 python-single-r1 - -DESCRIPTION="Interactive Python accessibility explorer" -HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser https://gitlab.gnome.org/GNOME/accerciser" - -LICENSE="BSD CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="amd64 x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - >=app-accessibility/at-spi2-core-2.5.2:2 - >=x11-libs/gtk+-3.1.13:3[introspection] - $(python_gen_cond_dep ' - >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] - >=dev-python/ipython-0.11[${PYTHON_USEDEP}] - >=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/python-xlib[${PYTHON_USEDEP}] - ') - - dev-libs/atk[introspection] - >=dev-libs/glib-2.28:2 - dev-libs/gobject-introspection:= - x11-libs/gdk-pixbuf[introspection] - x11-libs/libwnck:3[introspection] - x11-libs/pango[introspection] - gnome-base/librsvg[introspection] - ${PYTHON_DEPS} -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_install() { - gnome2_src_install - python_optimize -} diff --git a/app-accessibility/kontrast/Manifest b/app-accessibility/kontrast/Manifest index 25be46369092..6e467525d1c8 100644 --- a/app-accessibility/kontrast/Manifest +++ b/app-accessibility/kontrast/Manifest @@ -1,2 +1,2 @@ DIST kontrast-23.08.5.tar.xz 211984 BLAKE2B f1c50f90031615bc9a3ddd00155f40fed2244994de309385e386fae7e21dddb7bd1dfa5a722050dcf67c7ad3def6d1979efc8623a18bcc21b6438178d15fc116 SHA512 e70d5bdc5a7363358f8d09c6a2bafda9645bcb5f9acc0fa4e51ed836e87baa92b3f9e6c4a81bd3d1050de152100426e714c6dd8d46459aa0d81949776880f9ae -DIST kontrast-24.02.1.tar.xz 213136 BLAKE2B dfce8dbafaa51ee2f292148e2a80f3513584e6d13c47972c1e9977d4fdfeedfd9a714c922979ed10f029ecd471904f9316a5f8a27fa0e70d0e427e200fba726c SHA512 28d4bdf96e34d9d64a7c853504fb476c22a051db21ea6438d390e6543f99395ce70aa7e4c4c9676f6397707ffb092eee5b60cca4029486f37e9bdda0c915206b +DIST kontrast-24.02.2.tar.xz 213068 BLAKE2B e0d47077d647f751683d49cf717b9aba45777079d2913c7e60fa21ef80441c51a07f45d47b2c9192a9976af4d2f2eb31e1da43f844da8dbda08b64236b334e1e SHA512 4a925a6b370820bc9d51352e81758059dd4cc8f4ac38f6cb6db5cf587653b4eb5599baa289fe22019e3a1314b05b979b950a7f34655901499d354a3cfab6d94f diff --git a/app-accessibility/kontrast/kontrast-24.02.1.ebuild b/app-accessibility/kontrast/kontrast-24.02.2.ebuild similarity index 100% rename from app-accessibility/kontrast/kontrast-24.02.1.ebuild rename to app-accessibility/kontrast/kontrast-24.02.2.ebuild diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index c049c9b7d98d..f8e2046901ba 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/ansible-molecule/Manifest b/app-admin/ansible-molecule/Manifest index b850ee05029c..948c0d4c840d 100644 --- a/app-admin/ansible-molecule/Manifest +++ b/app-admin/ansible-molecule/Manifest @@ -1 +1,2 @@ +DIST molecule-24.2.1.tar.gz 343228 BLAKE2B 9605b5a8e21d37597cbf35f0f6f811471909dde5496541b1d7cd130eb2b970125fdc291df6493f8716f38514df17d957094604ae49e64d16f2207a0d3682bd38 SHA512 3813163d72cee51987d340c8a1ed0e03d8abe509a601e94c3e32bf673a56edd83d0c2bde1347057fe8a4c2b37e11a068ef689dd669d4395da64bec3921f1403d DIST molecule-5.1.0.tar.gz 335161 BLAKE2B 55c2f3c181bef6ab848cf7b52b19649fd861dbdbd68b92d3de9e0a1330755b9b887affd8f78e92ab33145ed60e7131d3cf1ffb7b4d8f10c1c3cab8dd58288af9 SHA512 4d025a512e3a6ac7f424318f06bb23b2c1ef1cc122d31d012430bfccf4efeeb3c7ddf2450abd78378c1c50f54fffb1fa8f366f14eebe58125f177ced8cec3ff5 diff --git a/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild b/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild new file mode 100644 index 000000000000..5d55bc9dd5af --- /dev/null +++ b/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +DOCS_BUILDER="mkdocs" +DOCS_DEPEND=" + >=dev-python/mkdocs-ansible-24.3.0 + dev-python/mkdocs-autorefs + dev-python/mkdocstrings-python + media-gfx/cairosvg +" +PYPI_PN="molecule" + +inherit distutils-r1 docs optfeature pypi + +DESCRIPTION="A toolkit designed to aid in the development and testing of Ansible roles" +HOMEPAGE="https://pypi.org/project/molecule/ https://github.com/ansible/molecule/" + +LICENSE="MIT" +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.8[${PYTHON_USEDEP}] + >=dev-python/click-8.0[${PYTHON_USEDEP}] + =dev-python/click-help-colors-0.9[${PYTHON_USEDEP}] + >=dev-python/enrich-1.2.7[${PYTHON_USEDEP}] + >=dev-python/jinja-2.11.3[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.9.1[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + =dev-python/pyyaml-5.1[${PYTHON_USEDEP}] + >=dev-python/rich-9.5.1[${PYTHON_USEDEP}] + selinux? ( sys-libs/libselinux[python,${PYTHON_USEDEP}] ) +')" +BDEPEND="$(python_gen_cond_dep ' + =app-admin/ansible-lint-6.12.1[${PYTHON_USEDEP}] + app-misc/check-jsonschema[${PYTHON_USEDEP}] + >=dev-python/ansi2html-1.8.0[${PYTHON_USEDEP}] + >=dev-python/filelock-3.9.0[${PYTHON_USEDEP}] + =dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}] + >=dev-python/pytest-plus-0.4.0[${PYTHON_USEDEP}] + >=dev-python/pytest-xdist-3.1.0[${PYTHON_USEDEP}] + ) +')" + +PATCHES=( + "${FILESDIR}"/${PN}-24.2.1-mkdocs_google_fonts.patch +) + +# test_role.py doesn't play nicely with FEATURES=usersandbox. As for test_command.py: +# - quite a few of these tests use the network; +# - test_command_dependency[shell] only works if Molecule has previously been installed; +# - tests involving creation of a new scenario fail on ansible-lint errors, even though +# a config file is deployed which should skip expected issues. +EPYTEST_DESELECT=( + src/molecule/test/functional/test_command.py + src/molecule/test/unit/command/init/test_role.py +) + +distutils_enable_tests pytest + +pkg_postinst() { + optfeature_header "Some optional packages commonly used in Molecule scenarios:" + optfeature "checking playbooks for practices and behaviour that can be improved" app-admin/ansible-lint +} 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/awscli/Manifest b/app-admin/awscli/Manifest index 872ef7ed47df..84b911caba3b 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -1,5 +1,3 @@ -DIST aws-cli-1.32.69.gh.tar.gz 2675479 BLAKE2B 7a8ec84c029662145aaf49afd1b9194a7a021249ee7bff2f5c5b704703e54ee6f09c94cd0ccf85a968187f3e8e6c85a18fa31592f6bc82dc5c2aac9aaa02a643 SHA512 09f5929fcec0ec263f80b377ee21d256c52547f9f71b8a38382b0a9d39371646d0afcc3650079147f0dc8f6fa11d33cb4a9f3977c023be37851fca761ef6ac56 DIST aws-cli-1.32.74.gh.tar.gz 2682208 BLAKE2B aba8be6e597a6d07197bd06d51f167f7a2dbed317c630572585cd006f6edfceac054726a20afe20faf6de381cbb75e352a7d6ab9e232b6e669fd59ca5888e122 SHA512 2f19b7c383c91528f15b93b00df285bdf32685c08e41e4f8f3a62cbbd5cff2615ca98c5eb925a5a2a2d13b452a0a08658749f4f7a48045a537ee7ec7e23cd663 DIST aws-cli-1.32.79.gh.tar.gz 2685785 BLAKE2B 3bbfad927d9d882e6b502f47919ce963df498c614a92730c5d6b1fb4efd7a8bd805a5c8cc82c705b97d8ee0ddbee4d6ddfa9cb46661fe7e9337add53bda3d9a1 SHA512 e0e369b6a5fca4d72365e54ef99c862e2d6f68caed61ac431516777e82ec8b292cf50516f379d8e94787b2a0ee58ad6e68d0951624f1ed742079295c4d2987ce -DIST aws-cli-1.32.80.gh.tar.gz 2685662 BLAKE2B 9dd199937159943c419d4df98badee5253c9910c2d392fd843ff63d8edca6f71309c97221b623c7f0e2140a615cf804f69048024d6fbefea75d0da78cdafdfc1 SHA512 f30fc5a9f1890ef3d313e527d886588720d7ba039a44975c7600ea0bb326b542eb3897341cc832d68e759c95bbb2de8f8cc0ecfbf9c1c1b7e4d00dd9c7fd3213 -DIST aws-cli-1.32.81.gh.tar.gz 2687946 BLAKE2B 09b672ceb60ba98c49bc7d747ce3639e40e0add35f583de7e42cea5e885fd833bd91c6eb4c94630c7151c914cebe28ee1327472a736d46ae3594e3a558db4e81 SHA512 f94f7147a946bfeb7414d08c7144ce6b452eb68bc9d42c686724824c5e8d77b012a5496778bfdf7cb15114065f3227e456df22327eeda505bb49c6da46934c34 +DIST aws-cli-1.32.84.gh.tar.gz 2691519 BLAKE2B 4cb78f14975d74013803af0f6397d959294cca6046ee19c1a907ca3e60fd224539d39535416ddcc2713b1de653b78ba03965dc78415dd915e80d11fcd6fbe02f SHA512 19d2030201806b336ede2c5e09f761e39959a156057d68316180145232e54013f2e5fa57023146488d407aa7e655fdb2245058e45eb5c4d6778eecd867f6eac1 diff --git a/app-admin/awscli/awscli-1.32.69.ebuild b/app-admin/awscli/awscli-1.32.69.ebuild deleted file mode 100644 index b7c9ceb6d88f..000000000000 --- a/app-admin/awscli/awscli-1.32.69.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -inherit bash-completion-r1 distutils-r1 - -MY_P=aws-cli-${PV} -DESCRIPTION="Universal Command Line Environment for AWS" -HOMEPAGE=" - https://github.com/aws/aws-cli/ - https://pypi.org/project/awscli/ -" -SRC_URI=" - https://github.com/aws/aws-cli/archive/${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86" - -# botocore is x.(y+2).z -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)" -RDEPEND=" - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - !app-admin/awscli-bin -" -BDEPEND=" - test? ( - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pytest-forked[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_prepare() { - # do not rely on bundled deps in botocore (sic!) - find -name '*.py' -exec sed -i \ - -e 's:from botocore[.]vendored import:import:' \ - -e 's:from botocore[.]vendored[.]:from :' \ - {} + || die - # strip overzealous upper bounds on requirements - sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die - distutils-r1_src_prepare -} - -python_test() { - local serial_tests=( - tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success - tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} - tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success - tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking - tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows - tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking - tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success - tests/unit/customizations/test_sessionmanager.py - tests/unit/test_compat.py::TestIgnoreUserSignals - tests/unit/test_help.py - tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored - ) - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - EPYTEST_XDIST= epytest "${serial_tests[@]}" - - local EPYTEST_DESELECT=( "${serial_tests[@]}" ) - # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -} - -python_install_all() { - newbashcomp bin/aws_bash_completer aws - - insinto /usr/share/zsh/site-functions - newins bin/aws_zsh_completer.sh _aws - - distutils-r1_python_install_all - - rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die -} diff --git a/app-admin/awscli/awscli-1.32.74.ebuild b/app-admin/awscli/awscli-1.32.74.ebuild index 4a677affdbc4..b7c9ceb6d88f 100644 --- a/app-admin/awscli/awscli-1.32.74.ebuild +++ b/app-admin/awscli/awscli-1.32.74.ebuild @@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86" # botocore is x.(y+2).z BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)" diff --git a/app-admin/awscli/awscli-1.32.81.ebuild b/app-admin/awscli/awscli-1.32.81.ebuild deleted file mode 100644 index 4a677affdbc4..000000000000 --- a/app-admin/awscli/awscli-1.32.81.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -inherit bash-completion-r1 distutils-r1 - -MY_P=aws-cli-${PV} -DESCRIPTION="Universal Command Line Environment for AWS" -HOMEPAGE=" - https://github.com/aws/aws-cli/ - https://pypi.org/project/awscli/ -" -SRC_URI=" - https://github.com/aws/aws-cli/archive/${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" - -# botocore is x.(y+2).z -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)" -RDEPEND=" - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - !app-admin/awscli-bin -" -BDEPEND=" - test? ( - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pytest-forked[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_prepare() { - # do not rely on bundled deps in botocore (sic!) - find -name '*.py' -exec sed -i \ - -e 's:from botocore[.]vendored import:import:' \ - -e 's:from botocore[.]vendored[.]:from :' \ - {} + || die - # strip overzealous upper bounds on requirements - sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die - distutils-r1_src_prepare -} - -python_test() { - local serial_tests=( - tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success - tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} - tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success - tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking - tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows - tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking - tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success - tests/unit/customizations/test_sessionmanager.py - tests/unit/test_compat.py::TestIgnoreUserSignals - tests/unit/test_help.py - tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored - ) - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - EPYTEST_XDIST= epytest "${serial_tests[@]}" - - local EPYTEST_DESELECT=( "${serial_tests[@]}" ) - # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -} - -python_install_all() { - newbashcomp bin/aws_bash_completer aws - - insinto /usr/share/zsh/site-functions - newins bin/aws_zsh_completer.sh _aws - - distutils-r1_python_install_all - - rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die -} diff --git a/app-admin/awscli/awscli-1.32.80.ebuild b/app-admin/awscli/awscli-1.32.84.ebuild similarity index 100% rename from app-admin/awscli/awscli-1.32.80.ebuild rename to app-admin/awscli/awscli-1.32.84.ebuild diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index bf6adb21858a..f55d8c5c81e5 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -1,3 +1,2 @@ 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 diff --git a/app-admin/conky/conky-1.19.7.ebuild b/app-admin/conky/conky-1.19.7.ebuild deleted file mode 100644 index fc94496b9273..000000000000 --- a/app-admin/conky/conky-1.19.7.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# 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 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" -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] ) - irc? ( net-libs/libircclient ) - lua-cairo? ( x11-libs/cairo[X] ) - lua-imlib? ( media-libs/imlib2[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 - net-misc/curl - 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/libX11 - x11-libs/libXdamage - x11-libs/libXfixes - x11-libs/libXext - ) - 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=" - 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 bundled-toluapp ) - lua-imlib? ( X bundled-toluapp ) - lua-rsvg? ( X bundled-toluapp ) - nvidia? ( X ) - truetype? ( X ) - xinerama? ( 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+=( - -DBUILD_ARGB=yes - -DBUILD_X11=yes - -DBUILD_XDAMAGE=yes - -DBUILD_XDBE=yes - -DBUILD_XFIXES=yes - -DBUILD_XSHAPE=yes - -DBUILD_XINPUT=yes - -DBUILD_MOUSE_EVENTS=yes - -DOWN_WINDOW=yes - ) - else - mycmakeargs+=( - -DBUILD_X11=no - ) - fi - - mycmakeargs+=( - -DBUILD_APCUPSD=$(usex apcupsd) - -DBUILD_AUDACIOUS=no - -DBUILD_BUILTIN_CONFIG=yes - -DBUILD_CMUS=$(usex cmus) - -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_IMLIB2=$(usex lua-imlib) - -DBUILD_LUA_RSVG=$(usex lua-rsvg) - -DBUILD_MATH=$(usex math) - -DBUILD_MOC=$(usex moc) - -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_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/conky-1.19.8.ebuild b/app-admin/conky/conky-1.19.8.ebuild index 1db4f0fdeff5..3c34a84c0eba 100644 --- a/app-admin/conky/conky-1.19.8.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 diff --git a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild deleted file mode 100644 index baf5e9023c3a..000000000000 --- a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.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 - -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 - -DESCRIPTION="Make tinydns and dnscache logs human-readable" -HOMEPAGE="https://michael.orlitzky.com/code/djbdns-logparse.xhtml" -SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz" -LICENSE="AGPL-3+" -SLOT="0" -KEYWORDS="amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -# djbdns-logparse pipes the logs through the "tai64nlocal" program -# that comes with sys-process/daemontools. -RDEPEND="sys-process/daemontools" -BDEPEND="test? ( ${RDEPEND} )" - -python_install_all() { - doman "doc/man1/${PN}.1" - local DOCS=( doc/README ) - distutils-r1_python_install_all -} - -python_test() { - esetup.py test -} diff --git a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r2.ebuild b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r2.ebuild new file mode 100644 index 000000000000..2a5bb8a3b82e --- /dev/null +++ b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 + +DESCRIPTION="Make tinydns and dnscache logs human-readable" +HOMEPAGE="https://michael.orlitzky.com/code/djbdns-logparse.xhtml" +SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz" +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +# djbdns-logparse pipes the logs through the "tai64nlocal" program +# that comes with sys-process/daemontools. +RDEPEND="sys-process/daemontools" +BDEPEND="test? ( ${RDEPEND} )" + +python_install_all() { + doman "doc/man1/${PN}.1" + local DOCS=( doc/README ) + distutils-r1_python_install_all +} + +python_test() { + esetup.py test +} diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild index 631aad045b4c..cd0af0601e23 100644 --- a/app-arch/7zip/7zip-23.01.ebuild +++ b/app-arch/7zip/7zip-23.01.ebuild @@ -8,12 +8,12 @@ inherit edos2unix flag-o-matic toolchain-funcs NO_DOT_PV=$(ver_rs 1- '') DESCRIPTION="Free file archiver for extremely high compression" HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/" -# linux-x64 tarball is used for docs +# linux-x64 tarball is only used for docs SRC_URI=" mirror://sourceforge/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz mirror://sourceforge/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz " -S="${WORKDIR}/CPP/7zip" +S="${WORKDIR}" LICENSE="LGPL-2 BSD rar? ( unRAR )" SLOT="0" @@ -63,16 +63,18 @@ pkg_setup() { src_prepare() { # patch doesn't deal with CRLF even if file+patch match # not even with --ignore-whitespace, --binary or --force + pushd "./CPP/7zip" || die "Unable to switch directory" edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak + sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror" + popd >/dev/null || die "Unable to switch directory" default - - sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror" } src_compile() { - pushd "./Bundles/Alone2" || die "Unable to switch directory" + pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory" + # avoid executable stack when using uasm/jwasm, harmless otherwise append-ldflags -Wl,-z,noexecstack export G_CFLAGS=${CFLAGS} export G_CXXFLAGS=${CXXFLAGS} @@ -102,8 +104,6 @@ src_compile() { } src_install() { - dobin "./Bundles/Alone2/b/${bdir}/7zz" - - pushd "${WORKDIR}" || die "Unable to switch directory" + dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz" einstalldocs } diff --git a/app-arch/7zip/files/7zip-23.01-respect-build-env.patch b/app-arch/7zip/files/7zip-23.01-respect-build-env.patch index c897cf625931..a5871db9159c 100644 --- a/app-arch/7zip/files/7zip-23.01-respect-build-env.patch +++ b/app-arch/7zip/files/7zip-23.01-respect-build-env.patch @@ -5,8 +5,8 @@ Bug: https://bugs.gentoo.org/913188 Bug: https://bugs.gentoo.org/913189 ---- a/7zip_gcc.mak -+++ b/7zip_gcc.mak +--- a/CPP/7zip/7zip_gcc.mak ++++ b/CPP/7zip/7zip_gcc.mak @@ -87,14 +87,14 @@ SHARED_EXT=.dll LDFLAGS = -shared -DEF $(DEF_FILE) $(LDFLAGS_STATIC) else diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz index 4d31d78a1801..a00d27fabba3 100644 Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ diff --git a/app-arch/bzip3/Manifest b/app-arch/bzip3/Manifest index 06b0a52b2127..ae651b30a1be 100644 --- a/app-arch/bzip3/Manifest +++ b/app-arch/bzip3/Manifest @@ -1,2 +1 @@ -DIST bzip3-1.3.2.tar.xz 277768 BLAKE2B 6ee7e5d7f1ab11c19664937fc631e51f5707b6893441bdd6e1beb52e9e2e46255e31c782f61939eba3f966f2be74b422a89f5fcd9d3f42caea07784f2f858efd SHA512 76521377adfe737b30e77f5c3241c1c12214165492fba5acbc5ba09c8e7b91396b772f9fec936d6603413c3ef179a13597b13509df99bd8a2d56cbf14a70a84f DIST bzip3-1.4.0.tar.xz 278424 BLAKE2B d3e4ae283d3b4512e70ffe3ef63c4ee4fe6f7a0a272aacfe67aae155aed547b54c7e46bce2448b140c7af58ec968b33a1ea7660ffa492bd6bf6eed9fd9f9c4d1 SHA512 584eb77b3071b09c15f20ec88248c9295ca2107107fdcb0495364ac60807c688d167a6cbbdd1b67cc851cbebc0791661ecb44b4d03ca5fb7d2b89ce839452062 diff --git a/app-arch/bzip3/bzip3-1.3.2.ebuild b/app-arch/bzip3/bzip3-1.3.2.ebuild deleted file mode 100644 index 62f14502840e..000000000000 --- a/app-arch/bzip3/bzip3-1.3.2.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 - -inherit toolchain-funcs - -DESCRIPTION="A better and stronger spiritual successor to BZip2" -HOMEPAGE="https://github.com/kspalaiologos/bzip3" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git" -else - SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~loong x86" -fi - -LICENSE="LGPL-3+" -SLOT="0" - -src_configure() { - # ./configure script will default to Clang if it is found on the system, - # force the use of CC selected by the user with CC=$(tc-getCC) - econf CC=$(tc-getCC) -} - -src_install() { - default - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/app-arch/dtrx/dtrx-8.5.3-r1.ebuild b/app-arch/dtrx/dtrx-8.5.3-r1.ebuild new file mode 100644 index 000000000000..7a6ccf0a7793 --- /dev/null +++ b/app-arch/dtrx/dtrx-8.5.3-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 optfeature + +DESCRIPTION="Do The Right eXtraction - extracts archives of different formats" +HOMEPAGE="https://github.com/dtrx-py/dtrx/ + https://pypi.org/project/dtrx/" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}-py/${PN}.git" +else + inherit pypi + KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" + +DOCS=( README.md ) + +src_prepare() { + sed -i '/ *platform==/s|.*||' setup.cfg || die # bug #894148 + + distutils-r1_src_prepare +} + +pkg_postinst() { + local supported_format + local -a supported_formats=( + arj + bzip2 + cpio + gzip + lrzip + lzip + p7zip + rpm + unrar + unzip + xz-utils + zip + zstd + ) + + for supported_format in ${supported_formats[@]}; do + optfeature \ + "extraction of supported archives using ${supported_format}" \ + app-arch/${supported_format} + done +} diff --git a/app-arch/dtrx/dtrx-8.5.3.ebuild b/app-arch/dtrx/dtrx-8.5.3.ebuild deleted file mode 100644 index 43636b151107..000000000000 --- a/app-arch/dtrx/dtrx-8.5.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 optfeature - -DESCRIPTION="Do The Right eXtraction - extracts archives of different formats" -HOMEPAGE="https://github.com/dtrx-py/dtrx/ - https://pypi.org/project/dtrx/" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}-py/${PN}.git" -else - inherit pypi - KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86" -fi - -LICENSE="GPL-3+" -SLOT="0" - -DOCS=( README.md ) - -src_prepare() { - sed -i '/ *platform==/s|.*||' setup.cfg || die # bug #894148 - - distutils-r1_src_prepare -} - -pkg_postinst() { - local supported_format - local -a supported_formats=( - arj - bzip2 - cpio - gzip - lrzip - lzip - p7zip - rpm - unrar - unzip - xz-utils - zip - zstd - ) - - for supported_format in ${supported_formats[@]}; do - optfeature \ - "extraction of supported archives using ${supported_format}" \ - app-arch/${supported_format} - done -} diff --git a/app-arch/dtrx/dtrx-9999.ebuild b/app-arch/dtrx/dtrx-9999.ebuild index 42db2c734cf7..efeeace6e9ef 100644 --- a/app-arch/dtrx/dtrx-9999.ebuild +++ b/app-arch/dtrx/dtrx-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 optfeature diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest index 68d9d4b1e86b..a585b313b19c 100644 --- a/app-arch/file-roller/Manifest +++ b/app-arch/file-roller/Manifest @@ -1,2 +1 @@ -DIST file-roller-43.1.tar.xz 898216 BLAKE2B 1a48f642a6436e2cc34cc4629ac24ab984b382a0df0895b20b2c6e89f0c65c2b29360cffd2d5cd9e3542c7479e7588211fa38b31aaca2afbcef8391b9b4afdc7 SHA512 444467c2bf9c2aa885fad5119069232ea92872c1f08fc7cd517e2e64faef924f0b4a9195acbe042e535588ccd86b5147afa041f9ea355f480507c3743a2bb934 DIST file-roller-44.tar.xz 924236 BLAKE2B 12eebd312afdec8f87141d384d1476be7296073f911791328158af1ab93fcb4092ee79e0c65743c36eaa28e06b5b59503357b6c4cff87b4896d3969a67d08e45 SHA512 d40ac036161397828ded2bab7bdf1c029ef0b53fad65e0922e6eeec40442eb7a9898a7d5c3208f6dfda3ad6f51b0771f248ab64c177769b655493a44c403f824 diff --git a/app-arch/file-roller/file-roller-43.1.ebuild b/app-arch/file-roller/file-roller-43.1.ebuild deleted file mode 100644 index f87362e63332..000000000000 --- a/app-arch/file-roller/file-roller-43.1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg - -DESCRIPTION="Archive manager for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller" - -LICENSE="GPL-2+ CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" -IUSE="gtk-doc +introspection nautilus" -REQUIRED_USE="gtk-doc? ( introspection )" - -# gdk-pixbuf used extensively in the source -# cairo used in eggtreemultidnd.c -# pango used in fr-window -RDEPEND=" - >=dev-libs/glib-2.38:2 - >=x11-libs/gtk+-3.22.0:3 - >=gui-libs/libhandy-1.5.0:1 - nautilus? ( >=gnome-base/nautilus-43.0 ) - >=dev-libs/json-glib-0.14 - >=app-arch/libarchive-3.2:= - introspection? ( dev-libs/gobject-introspection ) - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/pango -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - gtk-doc? ( dev-util/gi-docgen ) -" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -${PN} is a frontend for several archiving utilities. If you want a -particular archive format support, see ${HOMEPAGE} -and install the relevant package. For example: -7-zip - app-arch/p7zip -ace - app-arch/unace -arj - app-arch/arj -brotli - app-arch/brotli -cpio - app-alternatives/cpio -deb - app-arch/dpkg -iso - app-cdr/cdrtools -jar,zip - app-arch/zip and app-arch/unzip -lha - app-arch/lha -lzop - app-arch/lzop -lz4 - app-arch/lz4 -rar - app-arch/unrar or app-arch/unar -rpm - app-arch/rpm -unstuff - app-arch/stuffit -zstd - app-arch/zstd -zoo - app-arch/zoo" - -src_prepare() { - # File providing Gentoo package names for various archivers - cp -v "${FILESDIR}"/3.36-packages.match data/packages.match || die - - default - xdg_environment_reset -} - -src_configure() { - local emesonargs=( - -Drun-in-place=false - $(meson_feature nautilus nautilus-actions) - -Dnotification=enabled - -Duse_native_appchooser=false - -Dpackagekit=false - -Dlibarchive=enabled - $(meson_feature introspection) - $(meson_feature gtk-doc api_docs) - ) - meson_src_configure -} - -src_install() { - meson_src_install - if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/ || die - mv "${ED}"/usr/share/doc/file-roller "${ED}"/usr/share/gtk-doc/file-roller || die - fi - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - readme.gentoo_print_elog -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest index 2b0fde8309f0..284181c5cc40 100644 --- a/app-arch/snappy/Manifest +++ b/app-arch/snappy/Manifest @@ -1,2 +1,2 @@ DIST snappy-1.1.10.tar.gz 1105312 BLAKE2B 5195335fb1883974d290e7dca2b6d928bde2b183f3f61bca9da28855b39fd9a4ee1c24014322d238d2ec94f3a3a55fd43110c88283e85865272226e11cbb4834 SHA512 3578597f1d4ec09104ce0296b825b013590351230dfe56c635081fd282ce7a13a34caf2c283ac77bd24065e2d27af6db068d1f84b98cec2fd39a0e37a0d77070 -DIST snappy-1.1.9.tar.gz 1102382 BLAKE2B 926d03156168e3d4800dc17144db3de2c182c6eb9970d87a00b94fb09b67e403479a64cbed75833b83fd03173c1bb8caaf248a55627e89fe2a34456f12ff3b42 SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024 +DIST snappy-1.2.0.tar.gz 1107265 BLAKE2B 327b60ea032ceb004c5f5e36a0013dc2a44258ec303d0701cf23446904b83e72a66b7e59866a7331c7751a08ce6ec6b871bc056efa6eeb86733d4640569d8072 SHA512 5b3b4e73ff24295885ff9f3d75ccb090e6c7dba40d4965f0892163aa9876296e61590d62023a32d750949268af8ce89df93273b02179d5b3a55de00966a3ae0a diff --git a/app-arch/snappy/files/snappy-1.1.9_gcc_inline.patch b/app-arch/snappy/files/snappy-1.1.9_gcc_inline.patch deleted file mode 100644 index 04d35f56ee98..000000000000 --- a/app-arch/snappy/files/snappy-1.1.9_gcc_inline.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 0c716d435abe65250100c2caea0e5126ac4e14bd Mon Sep 17 00:00:00 2001 -From: "Georgi D. Sotirov" -Date: Wed, 5 May 2021 14:16:46 +0300 -Subject: [PATCH] Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE - -Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE on AdvanceToNextTag to -fix the following compilation errors and a warning with GCC: - -[ 2%] Building CXX object CMakeFiles/snappy.dir/snappy.cc.o -/usr/bin/c++ -DHAVE_CONFIG_H -Dsnappy_EXPORTS --I/tmp/snappy-1.1.9/build -I/tmp/snappy-1.1.9 -O3 --march=i586 -mtune=i686 -Wall -Wextra -fno-exceptions -fno-rtti -O3 --DNDEBUG -fPIC -std=c++11 -o CMakeFiles/snappy.dir/snappy.cc.o -c -/tmp/snappy-1.1.9/snappy.cc -/tmp/snappy-1.1.9/snappy.cc:1017:8: warning: always_inline -function might not be inlinable [-Wattributes] - size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { - ^ -/tmp/snappy-1.1.9/snappy.cc: In function 'std::pair snappy::DecompressBranchless(const uint8_t*, const -uint8_t*, ptrdiff_t, T, ptrdiff_t) [with T = char*; uint8_t = unsigned -char; ptrdiff_t = int]': -/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in -call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, -size_t*)': function body can be overwritten at link time -/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here - size_t tag_type = AdvanceToNextTag(&ip, &tag); - ^ -/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in -call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, -size_t*)': function body can be overwritten at link time - size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { - ^ -/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here - size_t tag_type = AdvanceToNextTag(&ip, &tag); - ^ -/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in -call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, -size_t*)': function body can be overwritten at link time - size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { - ^ -/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here - size_t tag_type = AdvanceToNextTag(&ip, &tag); - ^ -CMakeFiles/snappy.dir/build.make:137: recipe for target -'CMakeFiles/snappy.dir/snappy.cc.o' failed - -Just like with other functions using SNAPPY_ATTRIBUTE_ALWAYS_INLINE -macro (i.e. __attribute__((always_inline)) ) it is necessary to use C++ -inline specifier. ---- - snappy.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/snappy.cc b/snappy.cc -index 79dc0e8..51157be 100644 ---- a/snappy.cc -+++ b/snappy.cc -@@ -1014,7 +1014,7 @@ void MemMove(ptrdiff_t dst, const void* src, size_t size) { - } - - SNAPPY_ATTRIBUTE_ALWAYS_INLINE --size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { -+inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { - const uint8_t*& ip = *ip_p; - // This section is crucial for the throughput of the decompression loop. - // The latency of an iteration is fundamentally constrained by the diff --git a/app-arch/snappy/files/snappy-1.2.0_external-gtest.patch b/app-arch/snappy/files/snappy-1.2.0_external-gtest.patch new file mode 100644 index 000000000000..6d929821ba0b --- /dev/null +++ b/app-arch/snappy/files/snappy-1.2.0_external-gtest.patch @@ -0,0 +1,46 @@ +From 4e6c67832f53b126d1e54b9398b88f23e75846f3 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" +Date: Thu, 11 Apr 2024 10:05:30 +0300 +Subject: [PATCH 1/3] Use external GTest suite + +--- + CMakeLists.txt | 22 ++-------------------- + 1 file changed, 2 insertions(+), 20 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 85afe58..e23d2ca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -319,27 +319,9 @@ endif(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS) + if(SNAPPY_BUILD_TESTS) + enable_testing() + +- # Prevent overriding the parent project's compiler/linker settings on Windows. +- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +- set(install_gtest OFF) +- set(install_gmock OFF) +- set(build_gmock ON) +- + # This project is tested using GoogleTest. +- add_subdirectory("third_party/googletest") +- +- # GoogleTest triggers a missing field initializers warning. +- if(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS) +- set_property(TARGET gtest +- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) +- set_property(TARGET gmock +- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) +- endif(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS) +- +- if(SNAPPY_HAVE_NO_IMPLICIT_INT_FLOAT_CONVERSION) +- set_property(TARGET gtest +- APPEND PROPERTY COMPILE_OPTIONS -Wno-implicit-int-float-conversion) +- endif(SNAPPY_HAVE_NO_IMPLICIT_INT_FLOAT_CONVERSION) ++ find_package(GTest REQUIRED) ++ include(GoogleTest) + + add_executable(snappy_unittest "") + target_sources(snappy_unittest +-- +2.43.2 + diff --git a/app-arch/snappy/files/snappy-1.2.0_no-werror.patch b/app-arch/snappy/files/snappy-1.2.0_no-werror.patch new file mode 100644 index 000000000000..813ff7a59136 --- /dev/null +++ b/app-arch/snappy/files/snappy-1.2.0_no-werror.patch @@ -0,0 +1,24 @@ +From 8a262c4de10c4a7e07db41779fd7ca1565d92631 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" +Date: Thu, 11 Apr 2024 10:06:47 +0300 +Subject: [PATCH 2/3] Don't use -Werror + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,13 +66,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra") + endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra") + +- # Use -Werror for clang only. +- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") +- endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror") +- endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- + # Disable sign comparison warnings. Matches upcoming Bazel setup. + if(NOT CMAKE_CXX_FLAGS MATCHES "-Wno-sign-compare") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare") +-- +2.43.2 + diff --git a/app-arch/snappy/files/snappy-1.2.0_remove-no-rtti.patch b/app-arch/snappy/files/snappy-1.2.0_remove-no-rtti.patch new file mode 100644 index 000000000000..dcfeae45cfbb --- /dev/null +++ b/app-arch/snappy/files/snappy-1.2.0_remove-no-rtti.patch @@ -0,0 +1,32 @@ +From 012ff3ef652027abd1a422268cf9f164b386f340 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" +Date: Thu, 11 Apr 2024 10:07:45 +0300 +Subject: [PATCH 3/3] Don't disable RTTI + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,10 +51,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHs-c-") + add_definitions(-D_HAS_EXCEPTIONS=0) +- +- # Disable RTTI. +- string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-") + else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + # Use -Wall for clang and gcc. + if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall") +@@ -88,10 +84,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + # Disable C++ exceptions. + string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") +- +- # Disable RTTI. +- string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") + endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + + # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make +-- +2.43.2 + diff --git a/app-arch/snappy/snappy-1.1.9-r1.ebuild b/app-arch/snappy/snappy-1.1.9-r1.ebuild deleted file mode 100644 index b6cbd7792108..000000000000 --- a/app-arch/snappy/snappy-1.1.9-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -DESCRIPTION="A high-speed compression/decompression library by Google" -HOMEPAGE="https://github.com/google/snappy" -SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV%%.*}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-cpp/gtest )" - -DOCS=( format_description.txt framing_format.txt NEWS README.md ) - -PATCHES=( - "${FILESDIR}/${P}_gcc_inline.patch" - "${FILESDIR}/${P}_external_gtest.patch" - "${FILESDIR}/${P}-clang-werror.patch" - "${FILESDIR}/${P}_remove-no-rtti.patch" -) - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_CXX_STANDARD=14 # Latest gtest needs -std=c++14 or newer - -DSNAPPY_BUILD_TESTS=$(usex test) - -DSNAPPY_BUILD_BENCHMARKS=OFF - # Options below are related to benchmarking, that we disable. - -DHAVE_LIBZ=NO - -DHAVE_LIBLZO2=NO - -DHAVE_LIBLZ4=NO - ) - cmake_src_configure -} - -multilib_src_test() { - # run tests directly to get verbose output - cd "${S}" || die - "${BUILD_DIR}"/snappy_unittest || die -} diff --git a/app-arch/snappy/snappy-1.2.0-r1.ebuild b/app-arch/snappy/snappy-1.2.0-r1.ebuild new file mode 100644 index 000000000000..a2331f1ef08a --- /dev/null +++ b/app-arch/snappy/snappy-1.2.0-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="A high-speed compression/decompression library by Google" +HOMEPAGE="https://github.com/google/snappy" +SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +# ${PV%%.*}.FUDGE where FUDGE is incremented if ABI is broken without a new SONAME +# Please use abidiff on bumps. +SLOT="0/${PV%%.*}.2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-cpp/gtest )" + +DOCS=( format_description.txt framing_format.txt NEWS README.md ) + +PATCHES=( + "${FILESDIR}/${PN}-1.2.0_external-gtest.patch" + "${FILESDIR}/${PN}-1.2.0_no-werror.patch" + "${FILESDIR}/${PN}-1.2.0_remove-no-rtti.patch" +) + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_CXX_STANDARD=14 # Latest gtest needs -std=c++14 or newer + -DSNAPPY_BUILD_TESTS=$(usex test) + -DSNAPPY_REQUIRE_AVX=$(usex cpu_flags_x86_avx) + -DSNAPPY_REQUIRE_AVX2=$(usex cpu_flags_x86_avx2) + -DSNAPPY_BUILD_BENCHMARKS=OFF + # Options below are related to benchmarking, that we disable. + -DHAVE_LIBZ=NO + -DHAVE_LIBLZO2=NO + -DHAVE_LIBLZ4=NO + ) + cmake_src_configure +} + +multilib_src_test() { + # run tests directly to get verbose output + cd "${S}" || die + "${BUILD_DIR}"/snappy_unittest || die +} diff --git a/app-arch/unrpa/metadata.xml b/app-arch/unrpa/metadata.xml index 9daebc30be10..6f03c8b2ed2b 100644 --- a/app-arch/unrpa/metadata.xml +++ b/app-arch/unrpa/metadata.xml @@ -1,7 +1,14 @@ - + + contact@hacktivis.me + Haelwenn (lanodan) Monnier + + + proxy-maint@gentoo.org + Proxy Maintainers + Unrpa is a script to extract files from archives created for the Ren'Py Visual Novel Engine (http://www.renpy.org/) diff --git a/app-arch/unrpa/unrpa-2.3.0-r1.ebuild b/app-arch/unrpa/unrpa-2.3.0-r1.ebuild index 6e5de4cab121..4e143eed4708 100644 --- a/app-arch/unrpa/unrpa-2.3.0-r1.ebuild +++ b/app-arch/unrpa/unrpa-2.3.0-r1.ebuild @@ -1,16 +1,16 @@ -# 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_{10..12} ) inherit distutils-r1 DESCRIPTION="Ren'Py's RPA data file extractor" HOMEPAGE="https://github.com/Lattyware/unrpa" SRC_URI="https://github.com/Lattyware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -SLOT="0" LICENSE="GPL-3" +SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/app-arch/upx-bin/Manifest b/app-arch/upx-bin/Manifest index d6e8e482bca1..99b8f0e2dd90 100644 --- a/app-arch/upx-bin/Manifest +++ b/app-arch/upx-bin/Manifest @@ -5,10 +5,10 @@ DIST upx-4.1.0-i386_linux.tar.xz 620220 BLAKE2B db56d61ae8abe1e0a776f994bcd855f9 DIST upx-4.1.0-mipsel_linux.tar.xz 678296 BLAKE2B 6c7601405b66c25ea7d5a902d137a737ea9f88c92ab152cd322db03fff2f4166802d41321aedac33ef31f903362ef7f6896998916a417a97a5fd539250fb1914 SHA512 23c0fc515bfd1cad35ad1241ecedfc938b8061e63311abeee3eb0c01f9dc502ce9d4be68e0f19354893b0936c1bd9e6795e40c458255e18df63edf0f42424157 DIST upx-4.1.0-powerpc64le_linux.tar.xz 674196 BLAKE2B cf6dfeea30f5054d8c9f69d88b8ff8c3d6f5e50e0ceab8fef8b51b403b96e571f2d73411d214743baedd7c12711047e0595349ca466373871a433035ca6cde30 SHA512 0f19ea1e04e7e226d2cd864e556170c7324f15bd3163458be1316ff9366b670eafe8a2d781220308efdb930941cb841a9a33702db7df61fec4b0521835a54bc7 DIST upx-4.1.0-powerpc_linux.tar.xz 675776 BLAKE2B 1ba5df26208c5781c33b18b7a1036a83bd9409a49fb30e54c64f04f16ec7a99bb83bbbc89dfdd9aff42acc866976803cc81706d077cab8275887999462ed44d0 SHA512 91584f0b3d257bc4b29631bf45313f9d226cd53e8629b0655bbb7d2b4c7a5450cfbf2b52c108bb7c727a17ffdb4afcb4baa9cb029c30dae057bf2d717d8ffea6 -DIST upx-4.2.2-amd64_linux.tar.xz 590172 BLAKE2B 6cb00856799b3568b3340509c142057292bda68a293e2fc0e6f20fbb89ac96649bb2523a1bc7728179516f5ba529fc1df0a6a99e7d671094fcd872fa527e3bc6 SHA512 f7d906ebb0bab74bf7dfe1f87fb700dd86e040b2f451d97233477fa13c67c98e845e34fd7828c5d7756e39634e128f2e7dedffc0b9b03b32b4bc36bca01117d8 -DIST upx-4.2.2-arm64_linux.tar.xz 600664 BLAKE2B 9dd992d2212d3eebea7ad743a3faa6c69b2c713539f4f486f7a88fb16c1f81382b767669fb1b38ff46037f2b2b6311edf2423dc345c9409dc07f1bcc2c11525b SHA512 a9f028c09f75ec01bded128c9aea9f29ae47ab24146d04aa50d9cd4be7a467899257776510e654fe38ff443d4dbe64916975583ecb94068a2c98ef40393bcae9 -DIST upx-4.2.2-armeb_linux.tar.xz 601780 BLAKE2B 1159fead612b13d7f758be95eab212b269f9a3d521af7db03b6698f5131779a8c72f6731032d4d49c373d6d15cadc77ebc56010f5b50390d7e96be75a60a8654 SHA512 9363f2aef07eaa2bf1ed0342810c0144d837473f00b2a75903b4a57bd9cd9110ccc2b5971e7f85a6f0f3b3eb4723a8e0ee7b191e9cb231a58b421ca83416e264 -DIST upx-4.2.2-i386_linux.tar.xz 640812 BLAKE2B 2767dfbccafb97603598c590784c30ebed3625121367c1faa464558fc76a52f62a7a3e3c1a0624cd0c5ca96e2df1debfef54408a09355b52f1889d409fa7207b SHA512 ca6558d7246315d482f08d80ab3003b2352f610ea1080704d30d3386970013516700329435a32577f97e6fb6eafb4547013e251d2f70bd1a7fa2e36de1a58bd9 -DIST upx-4.2.2-mipsel_linux.tar.xz 683044 BLAKE2B 6bc1884f3f8e5a55a7e73da3733493f3f4e8a5391f070c97d112197224d2ba38a1fac9aac7cb28a245b7fcd3cf053f3eae8052046351e3db993bf23a1e36c962 SHA512 582fe445064f7a57ab855b3295b9fe249c18f54925f2374e7d2fefd4dd24e228e5a8551019d389d8ebff53b30636a428018751ebf575d7436b873376140587a9 -DIST upx-4.2.2-powerpc64le_linux.tar.xz 678552 BLAKE2B 1334b7096b46ab2f2cb1226c3c6ad2c9523c58df08d12357cecb7d4bd8f27186f0cced5e85010e95fe3547dfcc4441dd3f08aa38fb4980aff4f8305c9ef50213 SHA512 0e1813751247c309bcdd8fed0f8266776b054b68492c229aeebb1cad0e68bd7218929f70714647d6398dad30ce6e69cc41dde5511af2ec623cb1722c2c135322 -DIST upx-4.2.2-powerpc_linux.tar.xz 679340 BLAKE2B e48f5310265c2c7f5829bf8206e172752cd9c22cbad6344da748083c90f7e5d614d59509db71f89b2259a98c61579289f376231c6a4af2d833bc840044d0efde SHA512 f9e3212e34f95c8370ec3b7eab179a91456b5d98e063c03777a6bb4fd0713e8490fc008c0e2c373ebe309997efce0fc9a29719df126a164449af9c91eec6b3e7 +DIST upx-4.2.3-amd64_linux.tar.xz 589416 BLAKE2B 88eb4f85477c589e7682b13faee4f9df8cb2021782e88cdde7f82c49dd77cfede269bef8f476e994749fcbadae459de8192a38aa0e17928a33156c54c032f8ae SHA512 0ec084ba2049cd283e5a14124bc130b69b55d1cafb19bb342516cf0a45ace4f247a0f11aaf0c302224998372222853768fcd8a50fd1c7828cdf9f1b0edfd47f9 +DIST upx-4.2.3-arm64_linux.tar.xz 600184 BLAKE2B 7d80b0eba5cef383af1cf8b31b22cd7e51002292f250f84313609338a2878b5a88c9caea8e8df4936bbd00ffc326b806e6dff897651f2219305e7abb56702a15 SHA512 1c7ac30057b564a9ae5ee4835f0662b203e1915931d82dad9369dd4d80565959f32afff07898b7a59630ec883cb215b6f41356abf35e5b400dde7ab4e9f88541 +DIST upx-4.2.3-armeb_linux.tar.xz 601892 BLAKE2B 5770139392ca379be96a7181420557d964ece2766e0dad0a315d0629b3e49b543cc8fbb3387e17cc92d26fdad65ff628341ef53e256c8ae910a744409d47d492 SHA512 bed641247a73b78cddb22940655691f60d87d7bcf3050d5ad14b3abc569c83f824433697a6790e3dd5fe029d6df2aad6878da13bb6fc8979d8a5e224d04a5504 +DIST upx-4.2.3-i386_linux.tar.xz 640800 BLAKE2B 995b9814ac25acbb10559f1b7594352cf80c104b554f0033391b7972b741cf35eed89cba6208f09298e08b861f4be17f567151793e504a7b8310da663faf7670 SHA512 bba0ca8f8438e01259ed2a3a30127777ea7cce3674b03eb5d7a96c32ed0028d3b06ab199973644d70e09aa405dec303434b4e318d99e1aa8d9db1c12c1deeb81 +DIST upx-4.2.3-mipsel_linux.tar.xz 684724 BLAKE2B e540b8b0ee7365a8b64ace9370f4f8c182995218eb1b4230ae094baddb75178e7eab06bd693f663c5e1f38f96ce66aa036f6792fcc6cedd9c8554a85b23a9027 SHA512 70e5fd35d36a6118afe10594ec17076ea0f4ba954edf7a15dd91a7dad1ca3ee9ed717fd31865fcd5611cb551d4f53b946daa14ce84d7a33f74b4d3ee85f7512b +DIST upx-4.2.3-powerpc64le_linux.tar.xz 673892 BLAKE2B cb48edf50219d1abe2524661dae7f0d3e5adbcf84db5d913c13a392b0ce6dc9d6c3c5589a2898d1d192d596ade52aa32d612849de21edba46eb807e2d01b76c0 SHA512 016ef2ed437bedd8c3c7d26be268d5a183a32b0290968bbf84318d32d0bc7187171d14d2be717c18b00bdefcfd4d068257780d1fd34dbcd300c9d4f759f05e34 +DIST upx-4.2.3-powerpc_linux.tar.xz 677584 BLAKE2B cb3a835fccf7e233e7dc8bbd4bee226901bbd8c82c5210199ce713cab1c03fa2ab6ada5825f7052d01688db571e1466acee963b4e09787cc65ec07791981f33c SHA512 deb0a6f088a62642142b02f2fc73790dc7c5b60cf6189fe9cde2aa259b9ec777ac5007c9168c4e5d71beb24d268d18b04c4c3e326a693edcb80d487dc3915145 diff --git a/app-arch/upx-bin/upx-bin-4.2.2.ebuild b/app-arch/upx-bin/upx-bin-4.2.3.ebuild similarity index 100% rename from app-arch/upx-bin/upx-bin-4.2.2.ebuild rename to app-arch/upx-bin/upx-bin-4.2.3.ebuild diff --git a/app-arch/upx/Manifest b/app-arch/upx/Manifest index 889517f1db6f..58606ce802e6 100644 --- a/app-arch/upx/Manifest +++ b/app-arch/upx/Manifest @@ -1,2 +1,2 @@ DIST upx-4.1.0-src.tar.xz 1267708 BLAKE2B ef7884028a97b1d7e542fc27756b705582786a22d193b1eef40d0db16580958baddc3baa44429b5ba2c0f7b5d4d0f4f79fdeb777af016b962b07c7639a319090 SHA512 de8306e833198d7f470c050b05c6111a50ea94f2e757c1006433742871ccd93fd7412f942cd776e9eac6c91e379545d72f070f3fe928e75e5d5092b766474f8c -DIST upx-4.2.2-src.tar.xz 1275320 BLAKE2B 747d8e9543325cafd368d5b47e7a90bfef042a80a58ad0fc1eba798716cebe16ef91645e436fd9506a3c8fe58aa28852437a81e4058afbb213284a4a2475c828 SHA512 03885abfd1db899ea21e9469068dbe046e4817de461e36a6c8a77f6a98f8ccaf00c95846ad3b13e59a5e037ce2f2bed7bea599396968e0aeb7ba5fce1b374a9b +DIST upx-4.2.3-src.tar.xz 1283824 BLAKE2B 2b53bf68196c35c05eb930760ad20446fbcde9b15e1e9261e2eb7553dc1c8ede48db952cd7c5bc6de5861ac98f9f62bb1d348806731fea7dad1e532fc7e1e636 SHA512 b9ebda5d3372132bb861e0dd035829b16e4c06900f68af182895f17975493707d78cbabc63060e581de1ce149bb5129d883f6e6abcde0413c0bf474db919f5fd diff --git a/app-arch/upx/upx-4.2.2.ebuild b/app-arch/upx/upx-4.2.2.ebuild deleted file mode 100644 index df37e7e83714..000000000000 --- a/app-arch/upx/upx-4.2.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Ultimate Packer for eXecutables (free version using UCL compression and not NRV)" -HOMEPAGE="https://upx.github.io/" -SRC_URI="https://github.com/upx/upx/releases/download/v${PV}/${P}-src.tar.xz" -S="${WORKDIR}/${P}-src" - -LICENSE="GPL-2+ UPX-exception" # Read the exception before applying any patches -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND="!app-arch/upx-bin" -BDEPEND="app-arch/xz-utils[extra-filters]" - -src_configure() { - local mycmakeargs=( - -DUPX_CONFIG_DISABLE_WERROR=ON - ) - cmake_src_configure -} - -src_test() { - # Don't run tests in parallel, #878977 - cmake_src_test -j1 -} diff --git a/app-arch/upx/upx-4.2.3.ebuild b/app-arch/upx/upx-4.2.3.ebuild new file mode 100644 index 000000000000..83d85276513a --- /dev/null +++ b/app-arch/upx/upx-4.2.3.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Ultimate Packer for eXecutables (free version using UCL compression and not NRV)" +HOMEPAGE="https://upx.github.io/" +SRC_URI="https://github.com/upx/upx/releases/download/v${PV}/${P}-src.tar.xz" +S="${WORKDIR}/${P}-src" + +LICENSE="GPL-2+ UPX-exception" # Read the exception before applying any patches +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="!app-arch/upx-bin" +BDEPEND="app-arch/xz-utils[extra-filters]" + +src_configure() { + local mycmakeargs=( + -DUPX_CONFIG_DISABLE_GITREV=ON + -DUPX_CONFIG_DISABLE_WERROR=ON + -DUPX_CONFIG_CMAKE_DISABLE_TEST=$(usex !test) + ) + cmake_src_configure +} + +src_test() { + # Don't run tests in parallel, #878977 + cmake_src_test -j1 +} diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz index b1db2f742607..d83d9849929f 100644 Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ diff --git a/app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r1.ebuild b/app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r1.ebuild deleted file mode 100644 index a36a06595c25..000000000000 --- a/app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r1.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 - -PYTHON_COMPAT=( python3_9 python3_10 python3_11 ) -PYTHON_REQ_USE="ssl(+)" -DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 - -DESCRIPTION="Back up Untangle configurations via the web admin UI" -HOMEPAGE="https://michael.orlitzky.com/code/untangle-https-backup.xhtml" -SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -src_install() { - distutils-r1_src_install - doman "doc/man8/${PN}.8" - dodoc "doc/${PN}.example.ini" -} diff --git a/app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r2.ebuild b/app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r2.ebuild new file mode 100644 index 000000000000..123e746bccf5 --- /dev/null +++ b/app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r2.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_10 python3_11 python3_12 ) +PYTHON_REQ_USE="ssl(+)" +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 + +DESCRIPTION="Back up Untangle configurations via the web admin UI" +HOMEPAGE="https://michael.orlitzky.com/code/untangle-https-backup.xhtml" +SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="amd64 x86" + +src_install() { + distutils-r1_src_install + doman "doc/man8/${PN}.8" + dodoc "doc/${PN}.example.ini" +} diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz index 1fef0e59cd75..0e9cea2eef46 100644 Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ diff --git a/app-cdr/dolphin-plugins-mountiso/Manifest b/app-cdr/dolphin-plugins-mountiso/Manifest index a8c039a8611d..6ccdd0183bd1 100644 --- a/app-cdr/dolphin-plugins-mountiso/Manifest +++ b/app-cdr/dolphin-plugins-mountiso/Manifest @@ -1,3 +1,3 @@ DIST dolphin-plugins-23.04.3.tar.xz 272912 BLAKE2B f0eb8bbab16d66f1e964131b436af7d3ae8febc26cf4fe394489a978c701ef2f5689bea7daf9eed8d7ef2f1f2bdba000a487cf7f0704ad30bd25e2d403ce5fae SHA512 8f487ba0bcbe561915064247ddb2327c3b7c8fa6ffc5c511d9c9ef37bd4f28a624533ce7a2da2a86b10b65f37915ca10840517872b40c2fd014cead6da5972c8 DIST dolphin-plugins-23.08.5.tar.xz 274124 BLAKE2B c8b43bd7f87c7221023e75e3f66b450844b379d5bfc95e37ce01dfe983ba3dc234a319da2aaf0596e6eb54319bc4310c718b57d52d070f0f86cd67c6f67a8c4b SHA512 2dd30070660df63b988cda2e14f3ddc27a0cf451119d2a6b121cb9cbeb8788b94498ef25ca434501843784a8e24c4539fe17cc0ab5a158befbc9db5792944852 -DIST dolphin-plugins-24.02.1.tar.xz 296296 BLAKE2B 804ec7e27752b642e1f9c212be7d721dab502b8b162e7a0ee00406f3a8754ce43767b9cb01e5ac5c94d94cf42e171e9e4b90bda01e4db6f6ddf6cb841ede21d5 SHA512 de69bf30ac3c8a6e15542c084b89882fdb9af31db0ffa7160c77bc7f1ad26d8011953b194de41938370ac4babf73ee3e167850d9bb0cd506f93817de937a4688 +DIST dolphin-plugins-24.02.2.tar.xz 298356 BLAKE2B e40f64b6a97961ba9f614ba2a795d42c460b65073e1ab5c502cbd87f4810e0e381562890646501446af544aec5e7f790be266ec41407ef156e8a27ac0ba0d555 SHA512 585249422ef1637c2caee044a71d11c621127ef578131d2323e879b12bee2f17082c4811273e6bb0013d1386f7010ded187627965bfce0b1b412b25048cd11d8 diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.02.1.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.02.2.ebuild similarity index 100% rename from app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.02.1.ebuild rename to app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.02.2.ebuild diff --git a/app-cdr/isoimagewriter/Manifest b/app-cdr/isoimagewriter/Manifest index bb719c5f0d73..bde6e5d0f4aa 100644 --- a/app-cdr/isoimagewriter/Manifest +++ b/app-cdr/isoimagewriter/Manifest @@ -1,2 +1,2 @@ DIST isoimagewriter-1.0.0.tar.xz 451924 BLAKE2B cec34345811faa2d43f376ada085867856f7ab2473c070ed35db713fb627241a1c30c3b842c9b9329592f9f1f061e2f01db0dc63a381ad50c6b95b2b0c1b2733 SHA512 d50e8146cfde12d940ccfc1ed8ad71a69d203054e470d52e274589aa38d6fbdb018a79db4b63725c7b37acfedfa36b211cc79437e3f12668b8499d9ece3ee562 -DIST isoimagewriter-24.02.1.tar.xz 463160 BLAKE2B ba9b4fe5a4fea88ba86614a30f41c41e3c5f23a3f23d3562c63ef9b22bc9ddc0abe4074678977227bdd9f46589a77ab73af40181e13d364d06eb9273ea1f4486 SHA512 b3de35b0595e15299d383990987382cb1798dbf777f7c5b074efd6679883ed87eaaa4df904bb16c1b3f65265819bba23b0d4ede3ea42dfe7267485effb815989 +DIST isoimagewriter-24.02.2.tar.xz 463144 BLAKE2B 7e53e2d2d94d8222ee416e7f942f84b4497263b4bc66a2ad81a49455d9376175b0f9d1461b99982fe54eaadaa03dfe85384b1f8644d6c34b6ac7ac2f9121e10a SHA512 7648e2c494dc8e1a5ef71ab767f474df083fa161427d25f3759811e87477ff103512eafa496f105daac41c249317479c16ccae3e49062cce962a4c1101baf834 diff --git a/app-cdr/isoimagewriter/isoimagewriter-24.02.1.ebuild b/app-cdr/isoimagewriter/isoimagewriter-24.02.2.ebuild similarity index 100% rename from app-cdr/isoimagewriter/isoimagewriter-24.02.1.ebuild rename to app-cdr/isoimagewriter/isoimagewriter-24.02.2.ebuild diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz index 0f76059359c2..a4063f88c123 100644 Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ diff --git a/app-containers/containers-common/containers-common-0.57.0-r1.ebuild b/app-containers/containers-common/containers-common-0.57.0-r1.ebuild new file mode 100644 index 000000000000..3cb764cb31ce --- /dev/null +++ b/app-containers/containers-common/containers-common-0.57.0-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Common config files and docs for Containers stack" +HOMEPAGE="https://github.com/containers/common" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/common.git" +else + SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${P#containers-}" + KEYWORDS="amd64 arm64 ~riscv" +fi + +LICENSE="Apache-2.0" +SLOT="0" +RESTRICT="test" +RDEPEND=" + >=app-containers/containers-image-5.29.2 + app-containers/containers-storage + app-containers/containers-shortnames + !=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 ) + >=app-containers/cni-plugins-0.9.1 + ) +" + +BDEPEND=" + >=dev-go/go-md2man-2.0.2 +" + +src_prepare() { + default + + [[ -f docs/Makefile && -f Makefile ]] || die + sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die + + # add comments to mounts.conf + eapply "${FILESDIR}/examplify-mounts-conf.patch" +} + +src_compile() { + emake docs +} + +src_install() { + emake DESTDIR="${ED}" install + + insinto /usr/share/containers + doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf + + keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore +} diff --git a/app-containers/containers-image/containers-image-5.29.2-r1.ebuild b/app-containers/containers-image/containers-image-5.29.2-r1.ebuild index 770d024fa41e..5a0b9d37566c 100644 --- a/app-containers/containers-image/containers-image-5.29.2-r1.ebuild +++ b/app-containers/containers-image/containers-image-5.29.2-r1.ebuild @@ -21,6 +21,7 @@ SLOT="0" # https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969 RESTRICT='test' BDEPEND=">=dev-go/go-md2man-2.0.3" +RDEPEND="!<=app-containers/containers-common-0.57.0" PATCHES=( "${FILESDIR}"/moving-policy-json-default-yaml.patch "${FILESDIR}"/prevent-downloading-mods-5.29.2.patch diff --git a/app-containers/containers-image/containers-image-5.30.0.ebuild b/app-containers/containers-image/containers-image-5.30.0.ebuild index f4507f8d00cf..9d755c4cf4ad 100644 --- a/app-containers/containers-image/containers-image-5.30.0.ebuild +++ b/app-containers/containers-image/containers-image-5.30.0.ebuild @@ -21,6 +21,7 @@ SLOT="0" # https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969 RESTRICT='test' BDEPEND=">=dev-go/go-md2man-2.0.3" +RDEPEND="!<=app-containers/containers-common-0.57.0" PATCHES=( "${FILESDIR}"/fix-warnings.patch ) diff --git a/app-containers/containers-image/containers-image-9999.ebuild b/app-containers/containers-image/containers-image-9999.ebuild index f4507f8d00cf..9d755c4cf4ad 100644 --- a/app-containers/containers-image/containers-image-9999.ebuild +++ b/app-containers/containers-image/containers-image-9999.ebuild @@ -21,6 +21,7 @@ SLOT="0" # https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969 RESTRICT='test' BDEPEND=">=dev-go/go-md2man-2.0.3" +RDEPEND="!<=app-containers/containers-common-0.57.0" PATCHES=( "${FILESDIR}"/fix-warnings.patch ) diff --git a/app-containers/devcontainer/Manifest b/app-containers/devcontainer/Manifest index 010a1ec1e6c4..a133599c35b9 100644 --- a/app-containers/devcontainer/Manifest +++ b/app-containers/devcontainer/Manifest @@ -1,3 +1,2 @@ -DIST devcontainer-0.56.2.tgz 617293 BLAKE2B 33eb4ae861934e78b9e73e77ed23ec1177e09785cf72dbdeb07e3d80e86ba1ac69f26bc01e150609cd20bc6c7895afc9b6118ae4d5007413b066986c75850a11 SHA512 188fdddad81a7f8cc5409e646c467fdc0722f0d7e45f3b24ea0614a9007c714ac9f8aff13f0e8a65f6c0e06e8769b1a4cba792a5575ce0733379ade45998fd27 DIST devcontainer-0.57.0.tgz 617323 BLAKE2B 74dd49c0e741715e34dce79cdc73617f4bed68b87f11fafa403a9548b334ecff1af8e2e3705c57c31ca057e12b19094a75a3a3e339cac3b6d005e00e7e08b433 SHA512 7b5680d003630af459d5bf12f6873ea990a67b5f16888317a27d7197799d9ff1cd802834e669c4e1c601780fa8a07c38ec4dab77e7bf64de08406403e163e954 DIST devcontainer-0.58.0.tgz 618922 BLAKE2B e0962e273f6a28d4c6897523b565634d7849a37ed5866e47430080ac8e42026e888ba2a13cbcbb62dd6974f753383882b66b0129d1e7aad8321c938c58ffec58 SHA512 57beb86d4fcefddbaa4f13612cca0538b2449932164c062082a8ef62f3a7bd57ed6f7bb09e5954fe479c6da9caebc0b3075783fb3ba3391381ab7ce9027e5f08 diff --git a/app-containers/devcontainer/devcontainer-0.56.2.ebuild b/app-containers/devcontainer/devcontainer-0.56.2.ebuild deleted file mode 100644 index 10d7f50fc167..000000000000 --- a/app-containers/devcontainer/devcontainer-0.56.2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Reference implementation of the Development Containers specification" -HOMEPAGE="https://containers.dev/ - https://github.com/devcontainers/cli/" -SRC_URI="https://registry.npmjs.org/@devcontainers/cli/-/cli-${PV}.tgz - -> ${P}.tgz" -S="${WORKDIR}/package" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~x86" - -RDEPEND=" - net-libs/nodejs -" -BDEPEND=" - >=net-libs/nodejs-16[npm] -" - -DOCS=( CHANGELOG.md README.md ) - -src_compile() { - # Skip, nothing to compile here. - : -} - -src_install() { - local -a my_npm_opts=( - --audit false - --color false - --foreground-scripts - --global - --offline - --omit dev - --prefix "${ED}/usr" - --progress false - --verbose - ) - npm "${my_npm_opts[@]}" install "${DISTDIR}/${P}.tgz" || die "npm install failed" - - einstalldocs -} diff --git a/app-containers/docker-bench-security/Manifest b/app-containers/docker-bench-security/Manifest index 349c578306b2..f722cecc4f51 100644 --- a/app-containers/docker-bench-security/Manifest +++ b/app-containers/docker-bench-security/Manifest @@ -1,2 +1 @@ -DIST docker-bench-security-1.3.3.tar.gz 274361 BLAKE2B b0a3fef0fedd7353a11f18603af0a9bd5a9c5674df8e0c2988f3b7430739b1fe1c37b3bc29323f39604e8f9d3af66e4a64b97c1e4bb1ef253cc39e9b1e1cb6e2 SHA512 0b9a8bb3cc0bf0887f3b3462c3529568f6cc4d327f66fe482ceb24865a3df51ffee48a1a12c93ca13401f23bf1cd47b3e8b25c99537f63a823ff173d54994fe9 DIST docker-bench-security-1.6.0.tar.gz 349131 BLAKE2B ce4700e3b7448365420adfb20ca3fa1fa5316157b1f587c40a1ea24e45312ac059a31f5fb152838442e19822c977855323f528d8ddca95eb11347a74606e5913 SHA512 1f3391946dd93540f99e8ea212c9d907d7939d248105082e81845e62eb2a08c4c5a1a32d13c93676ca31df1ee76079a804d36de1874341ed5da64806ea1c7c7b diff --git a/app-containers/docker-bench-security/docker-bench-security-1.3.3.ebuild b/app-containers/docker-bench-security/docker-bench-security-1.3.3.ebuild deleted file mode 100644 index 7f98da207205..000000000000 --- a/app-containers/docker-bench-security/docker-bench-security-1.3.3.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Test for best practices around deploying docker containers" -HOMEPAGE="https://github.com/docker/docker-bench-security" -SRC_URI="https://github.com/docker/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=">=app-containers/docker-1.10" - -src_install() { -dobin "${FILESDIR}/docker-bench-security" -exeinto /usr/lib/${PN} -doexe ${PN}.sh -insinto /usr/lib/${PN} -doins -r *lib.sh tests - dodoc -r benchmark_log.png CONTRIBUTING.md distros docker-compose.yml \ - Dockerfile MAINTAINERS README.md -} diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest index 4ce1ac78a6d7..acdcd8a78aa7 100644 --- a/app-containers/docker-compose/Manifest +++ b/app-containers/docker-compose/Manifest @@ -7,3 +7,5 @@ DIST docker-compose-2.23.0-deps.tar.xz 163606408 BLAKE2B 56c60b81d7efd273309b713 DIST docker-compose-2.23.0.gh.tar.gz 343649 BLAKE2B 687f4aed8a4fa4edfb92b36a21210fec29d95fc441d5aee93f47b3f42b883f84b929fc72e0243e7816292ff51354aaa543069628de1a369d7f9832d64a0a1e73 SHA512 c6bb3041f8bc23ecf9932fdc1d0c88283848026083b1854770506fee7f1dbec2f605e6eaf159705ab8ed3f1b9669b8474addac61564b37aff84ea994abb88f4e DIST docker-compose-2.24.0-deps.tar.xz 165907064 BLAKE2B 22b760393edc5a17bee52c6ccd5f227e724aaee32eb92113898e2f01727ff8913f98e2dba2f1f43277feffa9332888d64ef24b7fb9eb0f90f5038d711271b66a SHA512 2446cd56c69cc8cf1908ef2fd76e969bbd9a743f0b75d25e6c99304a203951a3196d8b8a9a4052560fb4923d20be8023452f051c3c3215e38007a7c6173489c9 DIST docker-compose-2.24.0.gh.tar.gz 344571 BLAKE2B 4d79bf83b0584b8ed56c6f573798f8ed6fe264ffbfc870e9fbe6b79ba4c61248a6e139ebbbd0cd80b9ad607b5c71901ebb19b04e7b6c3e4cbbe8806d0a174eed SHA512 78e5d6ad6f00c4c4a5878b8231ab538bdc9a1d1df17fe1b5aca7bb3a4358897bd6742f8075c54fc00de8bccf5e9f6529acceb57ae221c0794b6c5b0e655b8771 +DIST docker-compose-2.26.1-deps.tar.xz 66292916 BLAKE2B 011026d25674981860ecdf37d598d1caa53394044c06dc335a8579d6f39d295d6f8304cada20b3f7f1691c680f32b998a4421ca4ac863d7eee186ad81c6cddfa SHA512 9834df136fd013e36481c1c88b63b945abff6d1183091a70affbea99e2d96681edcf6ec8cf0c95ec35d9ea9236ff4f9f8f2995ca80d069646edcc92555792f4f +DIST docker-compose-2.26.1.gh.tar.gz 361194 BLAKE2B 464afc0f4d41165b97c1c35f2fcf57916ea8e7da367b43c7efb0d863416ae3b13a243f56dd2261eec0f3c7465999ce5505bb62a2bc61c1e80998c2bacec905c5 SHA512 4a97326c6ed974400aca91a64e93ef0e1fa6b52f988f636b8bbcb43e14442c6702e2d42afda3e491a9da18176448f342ebae7212bf59617372295d831beb8aba diff --git a/app-containers/docker-compose/docker-compose-2.26.1.ebuild b/app-containers/docker-compose/docker-compose-2.26.1.ebuild new file mode 100644 index 000000000000..f306d5212cc7 --- /dev/null +++ b/app-containers/docker-compose/docker-compose-2.26.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 2018-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit go-module +MY_PV=${PV/_/-} + +DESCRIPTION="Multi-container orchestration for Docker" +HOMEPAGE="https://github.com/docker/compose" +SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~amd64 ~arm64" + +BDEPEND=">=dev-lang/go-1.21" +RDEPEND=">=app-containers/docker-cli-23.0.0" + +RESTRICT="test" +S="${WORKDIR}/compose-${MY_PV}" + +src_prepare() { + default + # do not strip + sed -i -e 's/-s -w//' Makefile || die +} + +src_compile() { + emake VERSION=v${PV} +} + +src_test() { + emake test +} + +src_install() { + exeinto /usr/libexec/docker/cli-plugins + doexe bin/build/docker-compose + dodoc README.md +} + +pkg_postinst() { + ewarn + ewarn "docker-compose 2.x is a sub command of docker" + ewarn "Use 'docker compose' from the command line instead of" + ewarn "'docker-compose'" + ewarn "If you need to keep 1.x around, please run the following" + ewarn "command before your next --depclean" + ewarn "# emerge --noreplace docker-compose:0" +} diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz index e8fdaa1bb4c2..9008cc75682a 100644 Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ diff --git a/app-crypt/certbot-dns-dnsimple/Manifest b/app-crypt/certbot-dns-dnsimple/Manifest index 6bc3eac1503d..e8c21bb48bdc 100644 --- a/app-crypt/certbot-dns-dnsimple/Manifest +++ b/app-crypt/certbot-dns-dnsimple/Manifest @@ -1 +1,2 @@ +DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd DIST certbot-2.6.0.gh.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3 diff --git a/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-2.10.0.ebuild b/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-2.10.0.ebuild new file mode 100644 index 000000000000..49462ea339f0 --- /dev/null +++ b/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-2.10.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 + +DESCRIPTION="DNSimple Authenticator plugin for Certbot (Let's Encrypt Client)" +HOMEPAGE="https://github.com/certbot/certbot https://certbot-dns-dnsimple.readthedocs.io/en/stable/" +# Use common certbot tarball +SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.gh.tar.gz" + +S="${WORKDIR}/certbot-${PV}/${PN}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] + >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] + >=dev-python/dns-lexicon-3.2.1[${PYTHON_USEDEP}] +" + +distutils_enable_sphinx docs dev-python/sphinx-rtd-theme +distutils_enable_tests pytest diff --git a/app-crypt/certbot-dns-dnsimple/metadata.xml b/app-crypt/certbot-dns-dnsimple/metadata.xml index 7b274bf81e54..0d75ba589015 100644 --- a/app-crypt/certbot-dns-dnsimple/metadata.xml +++ b/app-crypt/certbot-dns-dnsimple/metadata.xml @@ -5,10 +5,6 @@ azamat.hackimov@gmail.com Azamat H. Hackimov - - matthew@gentoo.org - Matthew Smith - proxy-maint@gentoo.org Proxy Maintainers diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild index f514363c71c1..67d72f68ad1e 100644 --- a/app-crypt/eid-mw/eid-mw-9999.ebuild +++ b/app-crypt/eid-mw/eid-mw-9999.ebuild @@ -13,19 +13,19 @@ LICENSE="LGPL-3" SLOT="0" IUSE="+dialogs +gtk p11-kit" -RDEPEND=">=sys-apps/pcsc-lite-1.2.9 +RDEPEND="sys-apps/pcsc-lite gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy - >=app-crypt/pinentry-1.1.0-r4[gtk] + app-crypt/pinentry[gtk] ) p11-kit? ( app-crypt/p11-kit )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" REQUIRED_USE="dialogs? ( gtk )" @@ -43,20 +43,6 @@ src_prepare() { -e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \ plugins_tools/aboutmw/gtk/about-main.c || die - # Fix libdir for manifestdir - sed -i \ - -e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \ - -e "/managed_storage_manifestdir/ s:prefix)/lib:libdir):" \ - cardcomm/pkcs11/src/Makefile.am || die - - # See bug #732994 - sed -i \ - -e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \ - configure.ac || die - - # See bug #751472 - eapply "${FILESDIR}/use-printf-in-Makefile.patch" - # See bug #811270 (remove uml build) sed -i \ -e 's:cardlayer/uml::' \ @@ -65,11 +51,6 @@ src_prepare() { -e 's:uml::' \ plugins_tools/eid-viewer/Makefile.am || die - # See bug #923375 - sed -i \ - -e 's:C_Sign(NULL,:C_Sign(NULL_PTR,:' \ - tests/unit/sign_state.c || die - eautoreconf } @@ -77,9 +58,8 @@ src_configure() { econf \ $(use_enable dialogs) \ $(use_enable p11-kit p11kit) \ - $(use_with gtk gtkvers 'detect') \ - --with-gnu-ld \ - --disable-static + $(use_with gtk gtkvers '3') \ + --with-gnu-ld } src_install() { diff --git a/app-crypt/gnupg/gnupg-2.2.42-r3.ebuild b/app-crypt/gnupg/gnupg-2.2.42-r3.ebuild index 1034d8d094e0..d0937a7079a9 100644 --- a/app-crypt/gnupg/gnupg-2.2.42-r3.ebuild +++ b/app-crypt/gnupg/gnupg-2.2.42-r3.ebuild @@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server" RESTRICT="!test? ( test )" diff --git a/app-crypt/keysmith/Manifest b/app-crypt/keysmith/Manifest index b63f44a1d22e..c696baaee948 100644 --- a/app-crypt/keysmith/Manifest +++ b/app-crypt/keysmith/Manifest @@ -1,2 +1,2 @@ DIST keysmith-23.08.5.tar.xz 163456 BLAKE2B b7338decbf1ccfe9f07d208decdcc1ea5133df9d7f53ff4e543c46782e5218e146e35f8d8348f8300021f7223d4edc8cf85a36ca777b00c52a5c13590c9ce12c SHA512 4c53ac7a217cd2f82cb0e270df1e4e7382d6fe3f7a7ff5008e392ae50418b6bf505f596d17c009921532bfbccba3d33f81cc934433ea63d9ba65c1187b4cba69 -DIST keysmith-24.02.1.tar.xz 170660 BLAKE2B e4c044599e8777a1d3db25f05d7d5a86488afcecf7efd8ac087d807f7f40af1eaf9ee8be5fd1b93d51af6d7267bd092e6e01e1964764862cab2bb182f847679b SHA512 8c70ec6da9e02901e6f4ea4f67958ab100b7c3838406c6a1c129029ab0c1613b9c2dd9b0d97651b6568eee95d7573f939c593a4660a8e2eb8f26391fc652e7ab +DIST keysmith-24.02.2.tar.xz 170744 BLAKE2B 89167a9decb9ad67d49bfb06a9cd0adca03e28aed0db697ba329e1cf76df5e96ef516cd802455e3c872afadc3d92a04dfa698380a9494f2fe1daffb5ca473e2e SHA512 9ee1750d3160a286b617a2f575759022b245a393da8ac5d5bc00363f1fe7a4088d6d444ac67d61dae22a15744178cafe1b3252177ab8ba37c7171150d626319d diff --git a/app-crypt/keysmith/keysmith-24.02.1.ebuild b/app-crypt/keysmith/keysmith-24.02.2.ebuild similarity index 100% rename from app-crypt/keysmith/keysmith-24.02.1.ebuild rename to app-crypt/keysmith/keysmith-24.02.2.ebuild diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz index a5a09e1b938c..16f58263c3e7 100644 Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ diff --git a/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild b/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild deleted file mode 100644 index eed8c867331f..000000000000 --- a/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MY_P="${PN}-${PV%.*}-${PV/*.}" - -DESCRIPTION="IPA dictionary for MeCab" -HOMEPAGE="http://taku910.github.io/mecab/" -SRC_URI="mirror://sourceforge/${PN%-*}/${MY_P}.tar.gz" - -LICENSE="ipadic" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="unicode" - -DEPEND="app-text/mecab[unicode=]" -S="${WORKDIR}/${MY_P}" - -src_configure() { - econf $(use_with unicode charset UTF-8) -} diff --git a/app-dicts/mecab-naist-jdic/mecab-naist-jdic-0.6.3b_p20111013.ebuild b/app-dicts/mecab-naist-jdic/mecab-naist-jdic-0.6.3b_p20111013.ebuild deleted file mode 100644 index 5c15498bfdd2..000000000000 --- a/app-dicts/mecab-naist-jdic/mecab-naist-jdic-0.6.3b_p20111013.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MY_P="${P/_p/-}" - -DESCRIPTION="NAIST Japanese Dictionary" -HOMEPAGE="http://sourceforge.jp/projects/naist-jdic/" -SRC_URI="mirror://sourceforge.jp/${PN#*-}/53500/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~loong ~riscv ~x86" -IUSE="unicode" - -DEPEND="app-text/mecab[unicode=]" -S="${WORKDIR}/${MY_P}" - -src_configure() { - econf $(use_with unicode charset UTF-8) -} diff --git a/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild b/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild deleted file mode 100644 index 05cd94ef34d4..000000000000 --- a/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MY_P="unidic-mecab-${PV}_src" - -DESCRIPTION="IPA dictionary for MeCab" -HOMEPAGE="https://osdn.jp/projects/unidic/" -SRC_URI="mirror://sourceforge.jp/${PN#*-}/58338/${MY_P}.zip" - -LICENSE="|| ( BSD GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~amd64 ~riscv" -IUSE="" - -DEPEND=" - app-arch/unzip - app-text/mecab" -S="${WORKDIR}/${MY_P}" diff --git a/app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild b/app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild deleted file mode 100644 index 0f45b493a69b..000000000000 --- a/app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="Wnn dictionary for librarian" -#HOMEPAGE="http://www.tulips.tsukuba.ac.jp/misc/export/cat/ldic" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="mirror://gentoo/ldic-${PV}-wnn.txt" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" -IUSE="" - -DEPEND="app-i18n/freewnn" -S="${WORKDIR}" - -src_unpack() { - : -} - -src_compile() { - local atod=atod - if has_version " "${T}/code-url-handler.desktop" || die + + sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \ + "${FILESDIR}/code.desktop" \ + > "${T}/code.desktop" || die + + domenu "${T}/code.desktop" + domenu "${T}/code-url-handler.desktop" + newicon "resources/app/resources/linux/code.png" "vscode.png" +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "desktop notifications" x11-libs/libnotify + optfeature "keyring support inside vscode" "virtual/secret-service" +} diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest index 81432a40a4a4..757e08a69b89 100644 --- a/app-editors/vscodium/Manifest +++ b/app-editors/vscodium/Manifest @@ -4,3 +4,6 @@ DIST vscodium-1.87.2.24072-arm64.tar.gz 127551847 BLAKE2B 7f8bcc64d094f7d88cb34a DIST vscodium-1.88.0.24096-amd64.tar.gz 129277895 BLAKE2B 8f7b2315fd55595c0d9b1e8925ed057847b08a3bc872a46dd99798af4e3a8b13dc45b6acf603b82b08b2756d6a944b848d27347ebc2a818b9a8ceedb577d20cc SHA512 53627ff4715e85142ea5b021a38af254d279a15046e4153538043ec2bfb82dbd8a7490f7dda4ebc6eac56f54fb435cfeb3b7ddddf08539855a055d4cbed13da1 DIST vscodium-1.88.0.24096-arm.tar.gz 118180248 BLAKE2B b9ab1f070541b56534c0568609428d24930bb3729e659677aaa48e11890ce91fa5c3ad487cc60927caf84fa90ff79e791181e7047cb6f8f2e55608cb929d4ad6 SHA512 eaa29c3793dae51cde6a5b9f1194fa58ec800e3eb68be2ff3178a05b78690d47b86884a8f8b155198ba8ec7bbd2fdc4d4e1d71875c2469c64189fad6c7fb53bb DIST vscodium-1.88.0.24096-arm64.tar.gz 128995233 BLAKE2B 0e566579e2fc11a017ca9e5d0fc21d9298b87ea5a6232bbb008d196bf943fcd4c06fe1308a0a181f6a5d497cb7e35c7ecc1901f76d73895bc572fe01c82edd84 SHA512 74f2f9504806d0d7cbb2dc4a51ef7e518b96e17e8d9f87fc569285493a2a3eb828dd15c56a773ca067590821ad27f6ecbe0ec89386cdd814ec5d6dbf524ccfe2 +DIST vscodium-1.88.1.24102-amd64.tar.gz 129277427 BLAKE2B 5b1584a4b1707e4616515cf242d097a09b83fde6326d2d6ca43bf4f321b299d930e0d3744603ee1a1b6affa72aeecb7a231423116a631aa10b2660efc1f72638 SHA512 e30b983f11ed7567c4e3f21fa9d3574cb60675ac0c1a1b4764c4eea8baa40099d54377a398ad13972f77aab72880789deefbf9f559a8773c62be4fafe954ae48 +DIST vscodium-1.88.1.24102-arm.tar.gz 118175032 BLAKE2B e1d53eecbfed89f48cbc65674261bb76470dbcac2c4a4a2e5a554beae42643d9a3b4a629872d9f220db0ac0fe7115385ce56663ef86b2d25d940b5ec000c8c21 SHA512 52ea09c2d761860febc1aa7bbb5edc0c6b6a2b8225e49d1c863de774bb6600cecc90bcdad25489d9eb99d4e2cf94f638d4482d539631126603ef5ffa8af1548d +DIST vscodium-1.88.1.24102-arm64.tar.gz 128995378 BLAKE2B 1a44737c071687a8126789caae088230c593a39bd49d915fc5b65431a36ccb7685c2f0ddeab8cc7a090acb6264c2b7fac0d6b8fcd270f4ba2ddfd0e3f3c1e02d SHA512 7c9d4f2acf07474fff03d129a8c63a9e663cb0ad0dc9a88020ea04c616f0bbd50586d690e2f7b4ebce6e0dcb5fdae8d620ef566abb5af14e1f7d0b6cc30968b1 diff --git a/app-editors/vscodium/vscodium-1.88.1.24102.ebuild b/app-editors/vscodium/vscodium-1.88.1.24102.ebuild new file mode 100644 index 000000000000..e22d9d5645b8 --- /dev/null +++ b/app-editors/vscodium/vscodium-1.88.1.24102.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop pax-utils xdg optfeature + +# Usage: arch_src_uri +arch_src_uri() { + echo "${1}? ( + https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-${2}-${PV}.tar.gz + -> ${P}-${1}.tar.gz + )" +} + +DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode" +HOMEPAGE="https://vscodium.com/" +SRC_URI=" + $(arch_src_uri amd64 x64) + $(arch_src_uri arm armhf) + $(arch_src_uri arm64 arm64) +" +S="${WORKDIR}" + +LICENSE=" + Apache-2.0 + BSD + BSD-1 + BSD-2 + BSD-4 + CC-BY-4.0 + ISC + LGPL-2.1+ + MIT + MPL-2.0 + openssl + PYTHON + TextMate-bundle + Unlicense + UoI-NCSA + W3C +" +SLOT="0" +KEYWORDS="-* amd64 ~arm ~arm64" +IUSE="egl kerberos wayland" +RESTRICT="strip bindist" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + app-crypt/libsecret[crypt] + app-misc/ca-certificates + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/libcanberra[gtk3] + media-libs/libglvnd + media-libs/mesa + net-misc/curl + net-print/cups + sys-apps/dbus + sys-libs/zlib + sys-process/lsof + x11-libs/cairo + x11-libs/gtk+:3 + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libxkbcommon + x11-libs/libxkbfile + x11-libs/libXrandr + x11-libs/libXScrnSaver + x11-libs/pango + x11-misc/xdg-utils + kerberos? ( app-crypt/mit-krb5 ) +" + +QA_PREBUILT="*" + +src_install() { + # Cleanup license file - it exists only in amd64 tarball + rm -f "${S}/resources/app/LICENSE.txt" || die + + if ! use kerberos; then + rm -rf "${S}/resources/app/node_modules.asar.unpacked/kerberos" || die + fi + + # Install + pax-mark m codium + mkdir -p "${ED}/opt/${PN}" || die + cp -r . "${ED}/opt/${PN}" || die + fperms 4711 /opt/${PN}/chrome-sandbox + + dosym -r "/opt/${PN}/bin/codium" "usr/bin/vscodium" + dosym -r "/opt/${PN}/bin/codium" "usr/bin/codium" + + local EXEC_EXTRA_FLAGS=() + if use wayland; then + EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" ) + fi + if use egl; then + EXEC_EXTRA_FLAGS+=( "--use-gl=egl" ) + fi + + sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \ + "${FILESDIR}/vscodium-url-handler.desktop" \ + > "${T}/vscodium-url-handler.desktop" || die + + sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \ + "${FILESDIR}/vscodium.desktop" \ + > "${T}/vscodium.desktop" || die + + domenu "${T}/vscodium.desktop" + domenu "${T}/vscodium-url-handler.desktop" + newicon "resources/app/resources/linux/code.png" "vscodium.png" +} + +pkg_postinst() { + xdg_pkg_postinst + elog "When compared to the regular VSCode, VSCodium has a few quirks" + elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md" + optfeature "desktop notifications" x11-libs/libnotify + optfeature "keyring support inside vscode" "virtual/secret-service" +} diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz index 3529e83c22cf..91b10d66a85a 100644 Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ diff --git a/app-emacs/cape/Manifest b/app-emacs/cape/Manifest index 47a4cc959271..7c3a1148e4c4 100644 --- a/app-emacs/cape/Manifest +++ b/app-emacs/cape/Manifest @@ -1,2 +1,2 @@ -DIST cape-1.3.tar.gz 40141 BLAKE2B ab9ab2855eb2b38396e7479e7514e65065282e6bf7a04d35e0766c811976392ccb18f128e2ed608eafd9150099aa88203ddbe3d75b48c53f2748d076cfa7e2df SHA512 abe987c0f67fa497d958f20f9e674a90a2ff8493adc865f3f961eee39f5e8367a1e78948e29a2336e973a187fb7e2f60786bb278b07f95d23376aae314ab6aa1 DIST cape-1.4.tar.gz 40299 BLAKE2B c1075551b2d1ba9555b41993067a4c96b122a3dd7147cb5378bfc2f41ac20e67606b4d0805adc35fe13d9cf70cb5b83ec86ae88471d2af9d6ceb8849b447938a SHA512 9890ec51b1202a1644767bf57d4174f388d90246a9d2b97e3f2c13c5a07371be3003b11275e2ba0cb41f0898f9185774e91db141947999ca4e8e31bc0e3efd22 +DIST cape-1.5.tar.gz 41327 BLAKE2B 5bf499786483161e485764b64dfe70f8aaf21e176e72f9a755fe0d681d107e690b28bc0c7d841b62154616e1dc38bf475577e7357719ce4e82a1184ac849e198 SHA512 d47e9c8b78a51e93e6dbd6c41440021eb117cb5c865a27cebeaf25a00891b7d315593e542f416c2b47c38f768b3fa663361f31798523534d60168dd68f2714b3 diff --git a/app-emacs/cape/cape-1.3.ebuild b/app-emacs/cape/cape-1.5.ebuild similarity index 100% rename from app-emacs/cape/cape-1.3.ebuild rename to app-emacs/cape/cape-1.5.ebuild diff --git a/app-emacs/elpy/elpy-1.35.0_p20220627-r1.ebuild b/app-emacs/elpy/elpy-1.35.0_p20220627-r1.ebuild new file mode 100644 index 000000000000..dbb7bd8ac1ba --- /dev/null +++ b/app-emacs/elpy/elpy-1.35.0_p20220627-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=ON +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 elisp + +DESCRIPTION="Emacs Python Development Environment" +HOMEPAGE="https://github.com/jorgenschaefer/elpy/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/jorgenschaefer/${PN}.git" +else + [[ "${PV}" == *_p20220627 ]] && COMMIT=de31d30003c515c25ff7bfd3a361c70c298f78bb + + SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${COMMIT}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + app-emacs/company-mode + app-emacs/highlight-indentation + app-emacs/pyvenv + app-emacs/s + app-emacs/yasnippet + $(python_gen_cond_dep ' + dev-python/flake8[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + ${RDEPEND} + test? ( + $(python_gen_cond_dep ' + dev-python/autopep8[${PYTHON_USEDEP}] + dev-python/jedi[${PYTHON_USEDEP}] + dev-python/yapf[${PYTHON_USEDEP}] + ') + ) +" + +ELISP_REMOVE=" + elpy/tests/test_black.py + elpy/tests/test_yapf.py +" +PATCHES=( + "${FILESDIR}/${PN}-elpy.el-yas-snippet-dirs.patch" + "${FILESDIR}/${PN}-elpy-rpc.el-elpy-rpc-pythonpath.patch" +) + +DOCS=( CONTRIBUTING.rst README.rst ) +SITEFILE="50${PN}-gentoo.el" + +distutils_enable_sphinx docs --no-autodoc +distutils_enable_tests unittest + +pkg_setup() { + elisp_pkg_setup + python-single-r1_pkg_setup +} + +src_prepare() { + distutils-r1_src_prepare + + sed -i "${PN}.el" -e "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" || die + sed -i "${PN}-rpc.el" -e "s|@PYTHONLIB@|${EPREFIX}/usr/lib/${EPYTHON}|" || die + + rm ${ELISP_REMOVE} || die + sed -i elpy/tests/support.py \ + -e "s|test_should_get_oneline_docstring_for_modules|disabled_&|" || die +} + +src_compile() { + distutils-r1_src_compile + elisp_src_compile +} + +src_test() { + distutils-r1_src_test +} + +src_install() { + distutils-r1_src_install + + elisp_src_install + insinto "${SITEETC}/${PN}" + doins -r snippets +} diff --git a/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild b/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild deleted file mode 100644 index eab92e1f5156..000000000000 --- a/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -[[ ${PV} == *_p20220627 ]] && COMMIT=de31d30003c515c25ff7bfd3a361c70c298f78bb - -DISTUTILS_SINGLE_IMPL=ON -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 elisp - -DESCRIPTION="Emacs Python Development Environment" -HOMEPAGE="https://github.com/jorgenschaefer/elpy/" -SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${COMMIT}.tar.gz - -> ${P}.tar.gz" -S="${WORKDIR}"/${PN}-${COMMIT} - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - app-emacs/company-mode - app-emacs/highlight-indentation - app-emacs/pyvenv - app-emacs/s - app-emacs/yasnippet - $(python_gen_cond_dep 'dev-python/flake8[${PYTHON_USEDEP}]') -" -BDEPEND=" - ${RDEPEND} - test? ( - $(python_gen_cond_dep ' - dev-python/autopep8[${PYTHON_USEDEP}] - dev-python/jedi[${PYTHON_USEDEP}] - dev-python/yapf[${PYTHON_USEDEP}] - ') - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-elpy.el-yas-snippet-dirs.patch - "${FILESDIR}"/${PN}-elpy-rpc.el-elpy-rpc-pythonpath.patch -) - -DOCS=( CONTRIBUTING.rst README.rst ) -SITEFILE="50${PN}-gentoo.el" - -distutils_enable_sphinx docs --no-autodoc -distutils_enable_tests unittest - -pkg_setup() { - elisp_pkg_setup - python-single-r1_pkg_setup -} - -src_prepare() { - distutils-r1_src_prepare - rm elpy/tests/test_black.py || die - - sed -i "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" ${PN}.el || die - sed -i "s|@PYTHONLIB@|${EPREFIX}/usr/lib/${EPYTHON}|" ${PN}-rpc.el || die -} - -src_compile() { - distutils-r1_src_compile - elisp_src_compile -} - -src_test() { - distutils-r1_src_test -} - -src_install() { - distutils-r1_src_install - - elisp_src_install - insinto ${SITEETC}/${PN} - doins -r snippets -} diff --git a/app-emacs/exec-path-from-shell/Manifest b/app-emacs/exec-path-from-shell/Manifest index da48b37f5a24..aea18b416c4e 100644 --- a/app-emacs/exec-path-from-shell/Manifest +++ b/app-emacs/exec-path-from-shell/Manifest @@ -1 +1,2 @@ DIST exec-path-from-shell-2.1.tar.gz 18673 BLAKE2B fd1d3c1cc6d7ce89eacbf9cd3cfe737a1867723dda28993ee049d91437dc8a17edf07ec1e4a121eae384deebfde934e371168ee6870e09886483cecce1bc306e SHA512 bd211756fa06115af45db6d9fb351f3affb0d59ae717643c9e4df422e63ddb780edf642d030db5b039e2759b2bfca948f7638d2dbd3ac84f3c2b8814b4a085f3 +DIST exec-path-from-shell-2.2.tar.gz 18935 BLAKE2B 7b255664037a68c3ec67fd3ed404a35d834f69431152f6baaa4c8f85aa8565968ad6cc59f8674d06dd86befd9d13fbf2f39b1347395451fc8bb9eb43138e9e0d SHA512 75bd4dd96c7224a7daf9709e5508ff45b3b7541713267282ff9a31e357e74e2ff8ad054193c1753e2d2f824206abcff5485fe7710037974c536b4afc87500b09 diff --git a/app-emacs/exec-path-from-shell/exec-path-from-shell-2.2.ebuild b/app-emacs/exec-path-from-shell/exec-path-from-shell-2.2.ebuild new file mode 100644 index 000000000000..d2795541094c --- /dev/null +++ b/app-emacs/exec-path-from-shell/exec-path-from-shell-2.2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit elisp + +DESCRIPTION="Ensure environment variables inside Emacs are the same as in shell" +HOMEPAGE="https://github.com/purcell/exec-path-from-shell/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/purcell/${PN}.git" +else + SRC_URI="https://github.com/purcell/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" + +DOCS=( README.md ) +SITEFILE="50${PN}-gentoo.el" + +src_compile() { + elisp_src_compile + elisp-make-autoload-file +} diff --git a/app-emacs/jinx/Manifest b/app-emacs/jinx/Manifest index 116ffff619d4..3ad6e01d5c47 100644 --- a/app-emacs/jinx/Manifest +++ b/app-emacs/jinx/Manifest @@ -1,3 +1,4 @@ DIST jinx-1.3.tar.gz 34055 BLAKE2B c91652d0791ace223013f0ac42d3b917d3fff6cd5920d27bcf48f65ead3a7d29bc7090af107619ceedc243f34c7984a2dadb8fa667d6a825c8a21107de5f186a SHA512 14f03352e16cbcdbfa4c0fe9c00a2a496d7086a0a7dee9c82c5673069e98b0d9b472722a8e90f03815770bf8f054349833e3e7d035deb53a4fa9d05fa54899da DIST jinx-1.4.tar.gz 34299 BLAKE2B c28a1535826a1b3a4541cae33ec5ac7badc4fec0188d5b269b0dfbb7fb8a12bf642ea9efb9f1b7289de0bbce5f60cc756ede878a36e1b2b3ec2a8ee26a2fb892 SHA512 fcf08e25d3429ae801006050b56cbc16b65eaa26694b0b20a3c475de716c1c7d4271838b4d553caae257cd82215dd8154c6feb277fb5a16e05c1d098567605a0 DIST jinx-1.5.tar.gz 34515 BLAKE2B fed6482001a879f50f9f8a093dc9e82443e0400b8e8c0c0b2fd4984cad4e48a4acd6d8a794a3ec71d3ee5d1c0dd851170dc5bec2a8e9ec9f0c7ddb6e25b5c732 SHA512 f19f7500e955b0ed584b2dc7e288911d59a584db596d55304c23d0ff28bceda6dad866b47891396fd342fe9f43d1adc8135611a67074f13638d58c28b545d3f8 +DIST jinx-1.6.tar.gz 34624 BLAKE2B 57917120dd6b10e30d989f056d3587452b2a2fe4db97df989de25c31ae7dd0e56ab2fd40cb92e570cd076209ab039ae0a8cc1ba7cb42210acbc4a1a07cef5f52 SHA512 b4e2b7ef03036e79c91e2a3d2c39ec6505ac9b6b2f7b32cfeee961448b4015de87c60adc9c14de3faccab14d7be75a77622fb0e21982a6e3fdcd58046c54d471 diff --git a/app-emacs/jinx/jinx-1.6.ebuild b/app-emacs/jinx/jinx-1.6.ebuild new file mode 100644 index 000000000000..fd1936d0c50c --- /dev/null +++ b/app-emacs/jinx/jinx-1.6.ebuild @@ -0,0 +1,45 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +NEED_EMACS=27.1 +inherit edo elisp toolchain-funcs + +DESCRIPTION="Enchanted Spell Checker for GNU Emacs" +HOMEPAGE="https://github.com/minad/jinx" + +SRC_URI=" + https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz +" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + app-text/enchant:2 + >=app-emacs/compat-29.1.4.0 +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +SITEFILE="50${PN}-gentoo.el" + +ELISP_TEXINFO="${PN}.texi" + +src_compile() { + edo $(tc-getCC) -fPIC -Wall -Wextra -shared \ + $($(tc-getPKG_CONFIG) --cflags --libs enchant-2) \ + ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o jinx-mod.so jinx-mod.c + elisp-org-export-to texinfo README.org + elisp_src_compile +} + +src_install() { + elisp-make-autoload-file + elisp_src_install + + elisp-modules-install "${PN}" jinx-mod.so + doinfo jinx.info +} diff --git a/app-emacs/nginx-mode/Manifest b/app-emacs/nginx-mode/Manifest index fab6b69bfc87..68b5d4977076 100644 --- a/app-emacs/nginx-mode/Manifest +++ b/app-emacs/nginx-mode/Manifest @@ -1 +1,2 @@ +DIST nginx-mode-1.1.10.tar.gz 3204 BLAKE2B e252c386d00e6c2a43ae4a8583189d4c06bf166e230b81b0f59449050376d539a7966f2e44a09ae70b42c5b51ea74fc8f84a1f15ebcb502f69001b2d564bd9e5 SHA512 93801701322afdbd6f02152108d69abd050bda9456b2016446d03c22ff1c886ec0d14da4be07f49c02ab2346b45480926c0ea4c00769233e4b32ad1a7cff4f00 DIST nginx-mode-1.1.9.tar.gz 3290 BLAKE2B 7a20632ed860e1e4f0f379f8c489bdb3f6a1eb09cf790ca4124dd08b631a101796fb96efc73672cc59b812c0136015d955a9d6bab2ccb223d777f299dd1c04c7 SHA512 a209b83f39696ccea8d45b0d90a25b4cdb56f85f1288ca9a7bf83b24a7d69ae2a1caea5e71f7c62ef693f8aac3e74e5dce7761b69ded7da037904df1c9d43536 diff --git a/app-emacs/nginx-mode/nginx-mode-1.1.10.ebuild b/app-emacs/nginx-mode/nginx-mode-1.1.10.ebuild new file mode 100644 index 000000000000..272a59e9de15 --- /dev/null +++ b/app-emacs/nginx-mode/nginx-mode-1.1.10.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit elisp + +DESCRIPTION="Emacs editing mode for Nginx config files" +HOMEPAGE="http://github.com/ajc/nginx-mode/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/ajc/${PN}.git" +else + SRC_URI="https://github.com/ajc/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2+" +SLOT="0" + +DOCS=( README.md ) +SITEFILE="50${PN}-gentoo.el" + +src_compile() { + elisp_src_compile + elisp-make-autoload-file +} diff --git a/app-emacs/ninja-mode/Manifest b/app-emacs/ninja-mode/Manifest index 4ccdb98ca1a4..5a84814e8171 100644 --- a/app-emacs/ninja-mode/Manifest +++ b/app-emacs/ninja-mode/Manifest @@ -1 +1,2 @@ DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 +DIST ninja-1.12.0.tar.gz 240291 BLAKE2B e7d721ab62164574b076f7cbf6d40fd2ee950534d124a58f5fe9e09bdae5895c8dc9dd7636a9f2f2b79774d6d9ba5f831e2c8b370826029af060fdc80fdc207f SHA512 167cd838ad47815183b79302a6e19227d956e634ae9d4211f0895ea9f4d893932e1154a765a9d5a1a3167b1a48b398f255fb4f46eb1395a6da11070bda628875 diff --git a/app-emacs/ninja-mode/files/50ninja-mode-gentoo-r1.el b/app-emacs/ninja-mode/files/50ninja-mode-gentoo-r1.el new file mode 100644 index 000000000000..30b88abef9be --- /dev/null +++ b/app-emacs/ninja-mode/files/50ninja-mode-gentoo-r1.el @@ -0,0 +1,3 @@ +(add-to-list 'load-path "@SITELISP@") +(autoload 'ninja-mode "ninja-mode" "ninja" t) +(add-to-list 'auto-mode-alist '("\\.ninja$" . ninja-mode)) diff --git a/app-emacs/ninja-mode/ninja-mode-1.12.0.ebuild b/app-emacs/ninja-mode/ninja-mode-1.12.0.ebuild new file mode 100644 index 000000000000..5cbb51651d61 --- /dev/null +++ b/app-emacs/ninja-mode/ninja-mode-1.12.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit elisp + +DESCRIPTION="GNU Emacs mode for handling Ninja build files" +HOMEPAGE="https://github.com/ninja-build/ninja/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/ninja-build/${PN/-mode}.git" +else + SRC_URI="https://github.com/ninja-build/${PN/-mode}/archive/v${PV}.tar.gz + -> ${P/-mode}.tar.gz" + S="${WORKDIR}/${P/-mode}/misc" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="Apache-2.0" +SLOT="0" + +RDEPEND=" + ! +From: Martin Kletzander +Date: Tue, 27 Feb 2024 16:20:12 +0100 +Subject: [PATCH 1/2] Fix off-by-one error in udevListInterfacesByStatus +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Ever since this function was introduced in 2012 it could've tried +filling in an extra interface name. That was made worse in 2019 when +the caller functions started accepting NULL arrays of size 0. + +This is assigned CVE-2024-1441. + +Signed-off-by: Martin Kletzander +Reported-by: Alexander Kuznetsov +Fixes: 5a33366f5c0b18c93d161bd144f9f079de4ac8ca +Fixes: d6064e2759a24e0802f363e3a810dc5a7d7ebb15 +Reviewed-by: Ján Tomko +(cherry picked from commit c664015fe3a7bf59db26686e9ed69af011c6ebb8) +Signed-off-by: Michal Privoznik +--- + src/interface/interface_backend_udev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c +index fb6799ed94..4091483060 100644 +--- a/src/interface/interface_backend_udev.c ++++ b/src/interface/interface_backend_udev.c +@@ -222,7 +222,7 @@ udevListInterfacesByStatus(virConnectPtr conn, + g_autoptr(virInterfaceDef) def = NULL; + + /* Ensure we won't exceed the size of our array */ +- if (count > names_len) ++ if (count >= names_len) + break; + + path = udev_list_entry_get_name(dev_entry); +-- +2.43.2 + diff --git a/app-emulation/libvirt/files/libvirt-10.2.0-remote-check-for-negative-array-lengths-before-alloc.patch b/app-emulation/libvirt/files/libvirt-10.2.0-remote-check-for-negative-array-lengths-before-alloc.patch new file mode 100644 index 000000000000..3e0426634f42 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-10.2.0-remote-check-for-negative-array-lengths-before-alloc.patch @@ -0,0 +1,222 @@ +From 10fa5f6ba64b354b99b0f7b372e66e45bb4d9379 Mon Sep 17 00:00:00 2001 +Message-ID: <10fa5f6ba64b354b99b0f7b372e66e45bb4d9379.1713033988.git.mprivozn@redhat.com> +In-Reply-To: <2127032ed8cd49001465dc0dce9f842e13467bc2.1713033988.git.mprivozn@redhat.com> +References: <2127032ed8cd49001465dc0dce9f842e13467bc2.1713033988.git.mprivozn@redhat.com> +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Fri, 15 Mar 2024 10:47:50 +0000 +Subject: [PATCH 2/2] remote: check for negative array lengths before + allocation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +While the C API entry points will validate non-negative lengths +for various parameters, the RPC server de-serialization code +will need to allocate memory for arrays before entering the C +API. These allocations will thus happen before the non-negative +length check is performed. + +Passing a negative length to the g_new0 function will usually +result in a crash due to the negative length being treated as +a huge positive number. + +This was found and diagnosed by ALT Linux Team with AFLplusplus. + +CVE-2024-2494 +Reviewed-by: Michal Privoznik +Found-by: Alexandr Shashkin +Co-developed-by: Alexander Kuznetsov +Signed-off-by: Daniel P. Berrangé +(cherry picked from commit 8a3f8d957507c1f8223fdcf25a3ff885b15557f2) +Signed-off-by: Michal Privoznik +--- + src/remote/remote_daemon_dispatch.c | 65 +++++++++++++++++++++++++++++ + src/rpc/gendispatch.pl | 5 +++ + 2 files changed, 70 insertions(+) + +diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c +index 7daf503b51..7542caa952 100644 +--- a/src/remote/remote_daemon_dispatch.c ++++ b/src/remote/remote_daemon_dispatch.c +@@ -2291,6 +2291,10 @@ remoteDispatchDomainGetSchedulerParameters(virNetServer *server G_GNUC_UNUSED, + if (!conn) + goto cleanup; + ++ if (args->nparams < 0) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative")); ++ goto cleanup; ++ } + if (args->nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); + goto cleanup; +@@ -2339,6 +2343,10 @@ remoteDispatchDomainGetSchedulerParametersFlags(virNetServer *server G_GNUC_UNUS + if (!conn) + goto cleanup; + ++ if (args->nparams < 0) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative")); ++ goto cleanup; ++ } + if (args->nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); + goto cleanup; +@@ -2497,6 +2505,10 @@ remoteDispatchDomainBlockStatsFlags(virNetServer *server G_GNUC_UNUSED, + goto cleanup; + flags = args->flags; + ++ if (args->nparams < 0) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative")); ++ goto cleanup; ++ } + if (args->nparams > REMOTE_DOMAIN_BLOCK_STATS_PARAMETERS_MAX) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); + goto cleanup; +@@ -2717,6 +2729,14 @@ remoteDispatchDomainGetVcpuPinInfo(virNetServer *server G_GNUC_UNUSED, + if (!(dom = get_nonnull_domain(conn, args->dom))) + goto cleanup; + ++ if (args->ncpumaps < 0) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("ncpumaps must be non-negative")); ++ goto cleanup; ++ } ++ if (args->maplen < 0) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("maplen must be non-negative")); ++ goto cleanup; ++ } + if (args->ncpumaps > REMOTE_VCPUINFO_MAX) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("ncpumaps > REMOTE_VCPUINFO_MAX")); + goto cleanup; +@@ -2811,6 +2831,11 @@ remoteDispatchDomainGetEmulatorPinInfo(virNetServer *server G_GNUC_UNUSED, + if (!(dom = get_nonnull_domain(conn, args->dom))) + goto cleanup; + ++ if (args->maplen < 0) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("maplen must be non-negative")); ++ goto cleanup; ++ } ++ + /* Allocate buffers to take the results */ + if (args->maplen > 0) + cpumaps = g_new0(unsigned char, args->maplen); +@@ -2858,6 +2883,14 @@ remoteDispatchDomainGetVcpus(virNetServer *server G_GNUC_UNUSED, + if (!(dom = get_nonnull_domain(conn, args->dom))) + goto cleanup; + ++ if (args->maxinfo < 0) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("maxinfo must be non-negative")); ++ goto cleanup; ++ } ++ if (args->maplen < 0) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("maxinfo must be non-negative")); ++ goto cleanup; ++ } + if (args->maxinfo > REMOTE_VCPUINFO_MAX) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("maxinfo > REMOTE_VCPUINFO_MAX")); + goto cleanup; +@@ -3096,6 +3129,10 @@ remoteDispatchDomainGetMemoryParameters(virNetServer *server G_GNUC_UNUSED, + + flags = args->flags; + ++ if (args->nparams < 0) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative")); ++ goto cleanup; ++ } + if (args->nparams > REMOTE_DOMAIN_MEMORY_PARAMETERS_MAX) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); + goto cleanup; +@@ -3156,6 +3193,10 @@ remoteDispatchDomainGetNumaParameters(virNetServer *server G_GNUC_UNUSED, + + flags = args->flags; + ++ if (args->nparams < 0) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative")); ++ goto cleanup; ++ } + if (args->nparams > REMOTE_DOMAIN_NUMA_PARAMETERS_MAX) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); + goto cleanup; +@@ -3216,6 +3257,10 @@ remoteDispatchDomainGetBlkioParameters(virNetServer *server G_GNUC_UNUSED, + + flags = args->flags; + ++ if (args->nparams < 0) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative")); ++ goto cleanup; ++ } + if (args->nparams > REMOTE_DOMAIN_BLKIO_PARAMETERS_MAX) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); + goto cleanup; +@@ -3277,6 +3322,10 @@ remoteDispatchNodeGetCPUStats(virNetServer *server G_GNUC_UNUSED, + + flags = args->flags; + ++ if (args->nparams < 0) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative")); ++ goto cleanup; ++ } + if (args->nparams > REMOTE_NODE_CPU_STATS_MAX) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); + goto cleanup; +@@ -3339,6 +3388,10 @@ remoteDispatchNodeGetMemoryStats(virNetServer *server G_GNUC_UNUSED, + + flags = args->flags; + ++ if (args->nparams < 0) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative")); ++ goto cleanup; ++ } + if (args->nparams > REMOTE_NODE_MEMORY_STATS_MAX) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); + goto cleanup; +@@ -3514,6 +3567,10 @@ remoteDispatchDomainGetBlockIoTune(virNetServer *server G_GNUC_UNUSED, + if (!conn) + goto cleanup; + ++ if (args->nparams < 0) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative")); ++ goto cleanup; ++ } + if (args->nparams > REMOTE_DOMAIN_BLOCK_IO_TUNE_PARAMETERS_MAX) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); + goto cleanup; +@@ -5079,6 +5136,10 @@ remoteDispatchDomainGetInterfaceParameters(virNetServer *server G_GNUC_UNUSED, + + flags = args->flags; + ++ if (args->nparams < 0) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative")); ++ goto cleanup; ++ } + if (args->nparams > REMOTE_DOMAIN_INTERFACE_PARAMETERS_MAX) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); + goto cleanup; +@@ -5299,6 +5360,10 @@ remoteDispatchNodeGetMemoryParameters(virNetServer *server G_GNUC_UNUSED, + + flags = args->flags; + ++ if (args->nparams < 0) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative")); ++ goto cleanup; ++ } + if (args->nparams > REMOTE_NODE_MEMORY_PARAMETERS_MAX) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); + goto cleanup; +diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl +index fa45d15a92..294e21f8a1 100755 +--- a/src/rpc/gendispatch.pl ++++ b/src/rpc/gendispatch.pl +@@ -1070,6 +1070,11 @@ elsif ($mode eq "server") { + print "\n"; + + if ($single_ret_as_list) { ++ print " if (args->$single_ret_list_max_var < 0) {\n"; ++ print " virReportError(VIR_ERR_RPC,\n"; ++ print " \"%s\", _(\"max$single_ret_list_name must be non-negative\"));\n"; ++ print " goto cleanup;\n"; ++ print " }\n"; + print " if (args->$single_ret_list_max_var > $single_ret_list_max_define) {\n"; + print " virReportError(VIR_ERR_RPC,\n"; + print " \"%s\", _(\"max$single_ret_list_name > $single_ret_list_max_define\"));\n"; +-- +2.43.2 + diff --git a/app-emulation/libvirt/libvirt-10.0.0-r1.ebuild b/app-emulation/libvirt/libvirt-10.0.0-r1.ebuild deleted file mode 100644 index 25ba088988c0..000000000000 --- a/app-emulation/libvirt/libvirt-10.0.0-r1.ebuild +++ /dev/null @@ -1,365 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Packages which get releases together: -# app-emacs/nxml-libvirt-schemas -# dev-python/libvirt-python -# dev-perl/Sys-Virt -# app-emulation/libvirt -# Please bump them together! - -PYTHON_COMPAT=( python3_{9..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc -inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" - EGIT_BRANCH="master" -else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz - verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -fi - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -IUSE=" - apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs - iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa - openvz parted pcap policykit +qemu rbd sasl selinux test +udev - virtiofsd virtualbox +virt-network wireshark-plugins xen zfs -" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - firewalld? ( virt-network ) - libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) - lxc? ( caps libvirtd ) - openvz? ( libvirtd ) - qemu? ( libvirtd ) - virt-network? ( libvirtd ) - virtualbox? ( libvirtd ) - xen? ( libvirtd )" - -BDEPEND=" - app-text/xhtml1 - dev-lang/perl - dev-libs/libxslt - dev-perl/XML-XPath - dev-python/docutils - virtual/pkgconfig - bash-completion? ( >=app-shells/bash-completion-2.0 ) - verify-sig? ( sec-keys/openpgp-keys-libvirt )" - -# gettext.sh command is used by the libvirt command wrappers, and it's -# non-optional, so put it into RDEPEND. -# We can use both libnl:1.1 and libnl:3, but if you have both installed, the -# package will use 3 by default. Since we don't have slot pinning in an API, -# we must go with the most recent. -RDEPEND=" - acct-user/qemu - app-misc/scrub - >=dev-libs/glib-2.56.0 - dev-libs/libgcrypt - dev-libs/libnl:3 - >=dev-libs/libxml2-2.9.1 - >=net-analyzer/openbsd-netcat-1.105-r1 - >=net-libs/gnutls-3.2.0:= - net-libs/libtirpc:= - >=net-misc/curl-7.18.0 - sys-apps/dbus - sys-apps/dmidecode - sys-devel/gettext - >=sys-libs/readline-7.0:= - virtual/acl - apparmor? ( sys-libs/libapparmor ) - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap-ng ) - dtrace? ( dev-debug/systemtap ) - firewalld? ( >=net-firewall/firewalld-0.6.3 ) - fuse? ( sys-fs/fuse:= ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( >=sys-block/open-iscsi-1.18.0 ) - iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) - libssh? ( >=net-libs/libssh-0.8.1:= ) - libssh2? ( >=net-libs/libssh2-1.3 ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) - lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) - nbd? ( sys-block/nbdkit ) - nfs? ( net-fs/nfs-utils ) - numa? ( - >sys-process/numactl-2.0.2 - sys-process/numad - ) - parted? ( - >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[lvm] - ) - pcap? ( >=net-libs/libpcap-1.8.0 ) - policykit? ( - acct-group/libvirt - >=sys-auth/polkit-0.9 - ) - qemu? ( - >=app-emulation/qemu-4.2 - app-crypt/swtpm - >=dev-libs/yajl-2.0.3:= - ) - rbd? ( sys-cluster/ceph ) - sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) - selinux? ( >=sys-libs/libselinux-2.0.85 ) - virt-network? ( - net-dns/dnsmasq[dhcp,ipv6(+),script] - net-firewall/ebtables - >=net-firewall/iptables-1.4.10[ipv6(+)] - net-misc/radvd - sys-apps/iproute2[-minimal] - ) - virtiofsd? ( app-emulation/virtiofsd ) - wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) - xen? ( - >=app-emulation/xen-4.9.0 - app-emulation/xen-tools:= - ) - udev? ( - virtual/libudev:= - >=x11-libs/libpciaccess-0.10.9 - ) - zfs? ( sys-fs/zfs ) - kernel_linux? ( sys-apps/util-linux )" -DEPEND=" - ${BDEPEND} - ${RDEPEND} - ${PYTHON_DEPS} -" -# The 'circular' dependency on dev-python/libvirt-python is because of -# virt-qemu-qmp-proxy. -PDEPEND=" - qemu? ( dev-python/libvirt-python ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch - "${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch -) - -pkg_setup() { - # Check kernel configuration: - CONFIG_CHECK="" - use fuse && CONFIG_CHECK+=" - ~FUSE_FS" - - use lvm && CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_MULTIPATH - ~DM_SNAPSHOT" - - use lxc && CONFIG_CHECK+=" - ~BLK_CGROUP - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_FREEZER - ~CGROUP_NET_PRIO - ~CGROUP_PERF - ~CGROUPS - ~CGROUP_SCHED - ~CPUSETS - ~IPC_NS - ~MACVLAN - ~NAMESPACES - ~NET_CLS_CGROUP - ~NET_NS - ~PID_NS - ~POSIX_MQUEUE - ~SECURITYFS - ~USER_NS - ~UTS_NS - ~VETH - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS" - - kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES" - - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_MARK_T - ~BRIDGE_NF_EBTABLES - ~NETFILTER_ADVANCED - ~NETFILTER_XT_CONNMARK - ~NETFILTER_XT_MARK - ~NETFILTER_XT_TARGET_CHECKSUM - ~IP_NF_FILTER - ~IP_NF_MANGLE - ~IP_NF_NAT - ~IP6_NF_FILTER - ~IP6_NF_MANGLE - ~IP6_NF_NAT" - - # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 - if use virt-network ; then - if kernel_is -lt 5 2 ; then - CONFIG_CHECK+=" - ~IP_NF_TARGET_MASQUERADE" - else - CONFIG_CHECK+=" - ~NETFILTER_XT_TARGET_MASQUERADE" - fi - fi - - # Bandwidth Limiting Support - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_T_NAT - ~IP_NF_TARGET_REJECT - ~NET_ACT_POLICE - ~NET_CLS_FW - ~NET_CLS_U32 - ~NET_SCH_HTB - ~NET_SCH_INGRESS - ~NET_SCH_SFQ" - - ERROR_USER_NS="Optional depending on LXC configuration." - - if [[ -n ${CONFIG_CHECK} ]]; then - linux-info_pkg_setup - fi - - python-any-r1_pkg_setup -} - -src_prepare() { - touch "${S}/.mailmap" || die - - default - python_fix_shebang . - - # Skip fragile tests which relies on pristine environment - # (Breaks because of sandbox environment variables) - # bug #802876 - sed -i -e "/commandtest/d" tests/meson.build || die - - # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die - sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ - -i "${S}/libvirtd.init" || die "sed failed" -} - -src_configure() { - local emesonargs=( - $(meson_feature apparmor) - $(meson_feature apparmor apparmor_profiles) - $(meson_feature audit) - $(meson_feature caps capng) - $(meson_feature dtrace) - $(meson_feature firewalld) - $(meson_feature fuse) - $(meson_feature glusterfs) - $(meson_feature glusterfs storage_gluster) - $(meson_feature iscsi storage_iscsi) - $(meson_feature iscsi-direct storage_iscsi_direct) - $(meson_feature libvirtd driver_libvirtd) - $(meson_feature libssh) - $(meson_feature libssh2) - $(meson_feature lvm storage_lvm) - $(meson_feature lvm storage_mpath) - $(meson_feature lxc driver_lxc) - $(meson_feature nbd nbdkit) - $(meson_feature nls) - $(meson_feature numa numactl) - $(meson_feature numa numad) - $(meson_feature openvz driver_openvz) - $(meson_feature parted storage_disk) - $(meson_feature pcap libpcap) - $(meson_feature policykit polkit) - $(meson_feature qemu driver_qemu) - $(meson_feature qemu yajl) - $(meson_feature rbd storage_rbd) - $(meson_feature sasl) - $(meson_feature selinux) - $(meson_feature test tests) - $(meson_feature udev) - $(meson_feature virt-network driver_network) - $(meson_feature virtualbox driver_vbox) - $(meson_feature wireshark-plugins wireshark_dissector) - $(meson_feature xen driver_libxl) - $(meson_feature zfs storage_zfs) - - -Dnetcf=disabled - -Dsanlock=disabled - -Dopenwsman=disabled - - -Ddriver_esx=enabled - -Dinit_script=systemd - -Dqemu_user=$(usex caps qemu root) - -Dqemu_group=$(usex caps qemu root) - -Ddriver_remote=enabled - -Dstorage_fs=enabled - -Ddriver_vmware=enabled - - --localstatedir="${EPREFIX}/var" - -Dinitconfdir="${EPREFIX}/etc/systemd" - -Drunstatedir="${EPREFIX}/run" - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - ) - - meson_src_configure -} - -src_test() { - export VIR_TEST_DEBUG=1 - # Don't run the syntax check tests, they're fragile and not relevant - # to us downstream anyway. - # We also crank up the timeout (as Fedora does) just to preempt failures - # on slower arches. - meson_src_test --no-suite syntax-check --timeout-multiplier 10 -} - -src_install() { - meson_src_install - - # Depending on configuration option, libvirt will create some bogus - # directoreis. They are either not used, or libvirtd is able to create - # them on demand, so let's remove them. - # - # Note, we are using -f here so that rm does not fail or warn if the - # directory is nonexistent. - rm -rf "${D}"/etc/sysconfig - rm -rf "${D}"/var - rm -rf "${D}"/run - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - - newinitd "${S}/libvirtd.init" libvirtd - newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests - newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd - newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd - - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -pkg_postinst() { - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die - fi - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - tmpfiles_process libvirtd.conf - readme.gentoo_print_elog -} diff --git a/app-emulation/libvirt/libvirt-10.0.0-r2.ebuild b/app-emulation/libvirt/libvirt-10.0.0-r2.ebuild new file mode 100644 index 000000000000..baf260598704 --- /dev/null +++ b/app-emulation/libvirt/libvirt-10.0.0-r2.ebuild @@ -0,0 +1,367 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Packages which get releases together: +# app-emacs/nxml-libvirt-schemas +# dev-python/libvirt-python +# dev-perl/Sys-Virt +# app-emulation/libvirt +# Please bump them together! + +PYTHON_COMPAT=( python3_{9..12} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc +inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" + EGIT_BRANCH="master" +else + SRC_URI="https://libvirt.org/sources/${P}.tar.xz + verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +fi + +DESCRIPTION="C toolkit to manipulate virtual machines" +HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +IUSE=" + apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs + iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa + openvz parted pcap policykit +qemu rbd sasl selinux test +udev + virtiofsd virtualbox +virt-network wireshark-plugins xen zfs +" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + firewalld? ( virt-network ) + libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) + lxc? ( caps libvirtd ) + openvz? ( libvirtd ) + qemu? ( libvirtd ) + virt-network? ( libvirtd ) + virtualbox? ( libvirtd ) + xen? ( libvirtd )" + +BDEPEND=" + app-text/xhtml1 + dev-lang/perl + dev-libs/libxslt + dev-perl/XML-XPath + dev-python/docutils + virtual/pkgconfig + bash-completion? ( >=app-shells/bash-completion-2.0 ) + verify-sig? ( sec-keys/openpgp-keys-libvirt )" + +# gettext.sh command is used by the libvirt command wrappers, and it's +# non-optional, so put it into RDEPEND. +# We can use both libnl:1.1 and libnl:3, but if you have both installed, the +# package will use 3 by default. Since we don't have slot pinning in an API, +# we must go with the most recent. +RDEPEND=" + acct-user/qemu + app-misc/scrub + >=dev-libs/glib-2.56.0 + dev-libs/libgcrypt + dev-libs/libnl:3 + >=dev-libs/libxml2-2.9.1 + >=net-analyzer/openbsd-netcat-1.105-r1 + >=net-libs/gnutls-3.2.0:= + net-libs/libtirpc:= + >=net-misc/curl-7.18.0 + sys-apps/dbus + sys-apps/dmidecode + sys-devel/gettext + >=sys-libs/readline-7.0:= + virtual/acl + apparmor? ( sys-libs/libapparmor ) + audit? ( sys-process/audit ) + caps? ( sys-libs/libcap-ng ) + dtrace? ( dev-debug/systemtap ) + firewalld? ( >=net-firewall/firewalld-0.6.3 ) + fuse? ( sys-fs/fuse:= ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) + iscsi? ( >=sys-block/open-iscsi-1.18.0 ) + iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) + libssh? ( >=net-libs/libssh-0.8.1:= ) + libssh2? ( >=net-libs/libssh2-1.3 ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) + lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) + nbd? ( sys-block/nbdkit ) + nfs? ( net-fs/nfs-utils ) + numa? ( + >sys-process/numactl-2.0.2 + sys-process/numad + ) + parted? ( + >=sys-block/parted-1.8[device-mapper] + sys-fs/lvm2[lvm] + ) + pcap? ( >=net-libs/libpcap-1.8.0 ) + policykit? ( + acct-group/libvirt + >=sys-auth/polkit-0.9 + ) + qemu? ( + >=app-emulation/qemu-4.2 + app-crypt/swtpm + >=dev-libs/yajl-2.0.3:= + ) + rbd? ( sys-cluster/ceph ) + sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) + selinux? ( >=sys-libs/libselinux-2.0.85 ) + virt-network? ( + net-dns/dnsmasq[dhcp,ipv6(+),script] + net-firewall/ebtables + >=net-firewall/iptables-1.4.10[ipv6(+)] + net-misc/radvd + sys-apps/iproute2[-minimal] + ) + virtiofsd? ( app-emulation/virtiofsd ) + wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) + xen? ( + >=app-emulation/xen-4.9.0 + app-emulation/xen-tools:= + ) + udev? ( + virtual/libudev:= + >=x11-libs/libpciaccess-0.10.9 + ) + zfs? ( sys-fs/zfs ) + kernel_linux? ( sys-apps/util-linux )" +DEPEND=" + ${BDEPEND} + ${RDEPEND} + ${PYTHON_DEPS} +" +# The 'circular' dependency on dev-python/libvirt-python is because of +# virt-qemu-qmp-proxy. +PDEPEND=" + qemu? ( dev-python/libvirt-python ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch + "${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch + "${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-10.1.0-Fix-off-by-one-error-in-udevListInterfacesByStatus.patch + "${FILESDIR}"/${PN}-10.2.0-remote-check-for-negative-array-lengths-before-alloc.patch +) + +pkg_setup() { + # Check kernel configuration: + CONFIG_CHECK="" + use fuse && CONFIG_CHECK+=" + ~FUSE_FS" + + use lvm && CONFIG_CHECK+=" + ~BLK_DEV_DM + ~DM_MULTIPATH + ~DM_SNAPSHOT" + + use lxc && CONFIG_CHECK+=" + ~BLK_CGROUP + ~CGROUP_CPUACCT + ~CGROUP_DEVICE + ~CGROUP_FREEZER + ~CGROUP_NET_PRIO + ~CGROUP_PERF + ~CGROUPS + ~CGROUP_SCHED + ~CPUSETS + ~IPC_NS + ~MACVLAN + ~NAMESPACES + ~NET_CLS_CGROUP + ~NET_NS + ~PID_NS + ~POSIX_MQUEUE + ~SECURITYFS + ~USER_NS + ~UTS_NS + ~VETH + ~!GRKERNSEC_CHROOT_MOUNT + ~!GRKERNSEC_CHROOT_DOUBLE + ~!GRKERNSEC_CHROOT_PIVOT + ~!GRKERNSEC_CHROOT_CHMOD + ~!GRKERNSEC_CHROOT_CAPS" + + kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES" + + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_MARK_T + ~BRIDGE_NF_EBTABLES + ~NETFILTER_ADVANCED + ~NETFILTER_XT_CONNMARK + ~NETFILTER_XT_MARK + ~NETFILTER_XT_TARGET_CHECKSUM + ~IP_NF_FILTER + ~IP_NF_MANGLE + ~IP_NF_NAT + ~IP6_NF_FILTER + ~IP6_NF_MANGLE + ~IP6_NF_NAT" + + # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 + if use virt-network ; then + if kernel_is -lt 5 2 ; then + CONFIG_CHECK+=" + ~IP_NF_TARGET_MASQUERADE" + else + CONFIG_CHECK+=" + ~NETFILTER_XT_TARGET_MASQUERADE" + fi + fi + + # Bandwidth Limiting Support + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_T_NAT + ~IP_NF_TARGET_REJECT + ~NET_ACT_POLICE + ~NET_CLS_FW + ~NET_CLS_U32 + ~NET_SCH_HTB + ~NET_SCH_INGRESS + ~NET_SCH_SFQ" + + ERROR_USER_NS="Optional depending on LXC configuration." + + if [[ -n ${CONFIG_CHECK} ]]; then + linux-info_pkg_setup + fi + + python-any-r1_pkg_setup +} + +src_prepare() { + touch "${S}/.mailmap" || die + + default + python_fix_shebang . + + # Skip fragile tests which relies on pristine environment + # (Breaks because of sandbox environment variables) + # bug #802876 + sed -i -e "/commandtest/d" tests/meson.build || die + + # Tweak the init script: + cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die + sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ + -i "${S}/libvirtd.init" || die "sed failed" +} + +src_configure() { + local emesonargs=( + $(meson_feature apparmor) + $(meson_feature apparmor apparmor_profiles) + $(meson_feature audit) + $(meson_feature caps capng) + $(meson_feature dtrace) + $(meson_feature firewalld) + $(meson_feature fuse) + $(meson_feature glusterfs) + $(meson_feature glusterfs storage_gluster) + $(meson_feature iscsi storage_iscsi) + $(meson_feature iscsi-direct storage_iscsi_direct) + $(meson_feature libvirtd driver_libvirtd) + $(meson_feature libssh) + $(meson_feature libssh2) + $(meson_feature lvm storage_lvm) + $(meson_feature lvm storage_mpath) + $(meson_feature lxc driver_lxc) + $(meson_feature nbd nbdkit) + $(meson_feature nls) + $(meson_feature numa numactl) + $(meson_feature numa numad) + $(meson_feature openvz driver_openvz) + $(meson_feature parted storage_disk) + $(meson_feature pcap libpcap) + $(meson_feature policykit polkit) + $(meson_feature qemu driver_qemu) + $(meson_feature qemu yajl) + $(meson_feature rbd storage_rbd) + $(meson_feature sasl) + $(meson_feature selinux) + $(meson_feature test tests) + $(meson_feature udev) + $(meson_feature virt-network driver_network) + $(meson_feature virtualbox driver_vbox) + $(meson_feature wireshark-plugins wireshark_dissector) + $(meson_feature xen driver_libxl) + $(meson_feature zfs storage_zfs) + + -Dnetcf=disabled + -Dsanlock=disabled + -Dopenwsman=disabled + + -Ddriver_esx=enabled + -Dinit_script=systemd + -Dqemu_user=$(usex caps qemu root) + -Dqemu_group=$(usex caps qemu root) + -Ddriver_remote=enabled + -Dstorage_fs=enabled + -Ddriver_vmware=enabled + + --localstatedir="${EPREFIX}/var" + -Dinitconfdir="${EPREFIX}/etc/systemd" + -Drunstatedir="${EPREFIX}/run" + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + ) + + meson_src_configure +} + +src_test() { + export VIR_TEST_DEBUG=1 + # Don't run the syntax check tests, they're fragile and not relevant + # to us downstream anyway. + # We also crank up the timeout (as Fedora does) just to preempt failures + # on slower arches. + meson_src_test --no-suite syntax-check --timeout-multiplier 10 +} + +src_install() { + meson_src_install + + # Depending on configuration option, libvirt will create some bogus + # directoreis. They are either not used, or libvirtd is able to create + # them on demand, so let's remove them. + # + # Note, we are using -f here so that rm does not fail or warn if the + # directory is nonexistent. + rm -rf "${D}"/etc/sysconfig + rm -rf "${D}"/var + rm -rf "${D}"/run + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf + + newinitd "${S}/libvirtd.init" libvirtd + newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests + newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd + newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd + + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests + + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +pkg_postinst() { + if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then + touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die + fi + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + tmpfiles_process libvirtd.conf + readme.gentoo_print_elog +} diff --git a/app-emulation/libvirt/libvirt-10.1.0-r1.ebuild b/app-emulation/libvirt/libvirt-10.1.0-r1.ebuild new file mode 100644 index 000000000000..128f76475972 --- /dev/null +++ b/app-emulation/libvirt/libvirt-10.1.0-r1.ebuild @@ -0,0 +1,366 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Packages which get releases together: +# app-emacs/nxml-libvirt-schemas +# dev-python/libvirt-python +# dev-perl/Sys-Virt +# app-emulation/libvirt +# Please bump them together! + +PYTHON_COMPAT=( python3_{10..12} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc +inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" + EGIT_BRANCH="master" +else + SRC_URI="https://libvirt.org/sources/${P}.tar.xz + verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +fi + +DESCRIPTION="C toolkit to manipulate virtual machines" +HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +IUSE=" + apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs + iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa + openvz parted pcap policykit +qemu rbd sasl selinux test +udev + virtiofsd virtualbox +virt-network wireshark-plugins xen zfs +" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + firewalld? ( virt-network ) + libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) + lxc? ( caps libvirtd ) + openvz? ( libvirtd ) + qemu? ( libvirtd ) + virt-network? ( libvirtd ) + virtualbox? ( libvirtd ) + xen? ( libvirtd )" + +BDEPEND=" + app-text/xhtml1 + dev-lang/perl + dev-libs/libxslt + dev-perl/XML-XPath + dev-python/docutils + virtual/pkgconfig + bash-completion? ( >=app-shells/bash-completion-2.0 ) + verify-sig? ( sec-keys/openpgp-keys-libvirt )" + +# gettext.sh command is used by the libvirt command wrappers, and it's +# non-optional, so put it into RDEPEND. +# We can use both libnl:1.1 and libnl:3, but if you have both installed, the +# package will use 3 by default. Since we don't have slot pinning in an API, +# we must go with the most recent. +RDEPEND=" + acct-user/qemu + app-misc/scrub + >=dev-libs/glib-2.56.0 + dev-libs/libgcrypt + dev-libs/libnl:3 + >=dev-libs/libxml2-2.9.1 + >=net-analyzer/openbsd-netcat-1.105-r1 + >=net-libs/gnutls-3.2.0:= + net-libs/libtirpc:= + >=net-misc/curl-7.18.0 + sys-apps/dbus + sys-apps/dmidecode + sys-devel/gettext + >=sys-libs/readline-7.0:= + virtual/acl + apparmor? ( sys-libs/libapparmor ) + audit? ( sys-process/audit ) + caps? ( sys-libs/libcap-ng ) + dtrace? ( dev-debug/systemtap ) + firewalld? ( >=net-firewall/firewalld-0.6.3 ) + fuse? ( sys-fs/fuse:= ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) + iscsi? ( >=sys-block/open-iscsi-1.18.0 ) + iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) + libssh? ( >=net-libs/libssh-0.8.1:= ) + libssh2? ( >=net-libs/libssh2-1.3 ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) + lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) + nbd? ( sys-block/nbdkit ) + nfs? ( net-fs/nfs-utils ) + numa? ( + >sys-process/numactl-2.0.2 + sys-process/numad + ) + parted? ( + >=sys-block/parted-1.8[device-mapper] + sys-fs/lvm2[lvm] + ) + pcap? ( >=net-libs/libpcap-1.8.0 ) + policykit? ( + acct-group/libvirt + >=sys-auth/polkit-0.9 + ) + qemu? ( + >=app-emulation/qemu-4.2 + app-crypt/swtpm + >=dev-libs/yajl-2.0.3:= + ) + rbd? ( sys-cluster/ceph ) + sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) + selinux? ( >=sys-libs/libselinux-2.0.85 ) + virt-network? ( + net-dns/dnsmasq[dhcp,ipv6(+),script] + net-firewall/ebtables + >=net-firewall/iptables-1.4.10[ipv6(+)] + net-misc/radvd + sys-apps/iproute2[-minimal] + ) + virtiofsd? ( app-emulation/virtiofsd ) + wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) + xen? ( + >=app-emulation/xen-4.9.0 + app-emulation/xen-tools:= + ) + udev? ( + virtual/libudev:= + >=x11-libs/libpciaccess-0.10.9 + ) + zfs? ( sys-fs/zfs ) + kernel_linux? ( sys-apps/util-linux )" +DEPEND=" + ${BDEPEND} + ${RDEPEND} + ${PYTHON_DEPS} +" +# The 'circular' dependency on dev-python/libvirt-python is because of +# virt-qemu-qmp-proxy. +PDEPEND=" + qemu? ( dev-python/libvirt-python ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch + "${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch + "${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-10.2.0-remote-check-for-negative-array-lengths-before-alloc.patch +) + +pkg_setup() { + # Check kernel configuration: + CONFIG_CHECK="" + use fuse && CONFIG_CHECK+=" + ~FUSE_FS" + + use lvm && CONFIG_CHECK+=" + ~BLK_DEV_DM + ~DM_MULTIPATH + ~DM_SNAPSHOT" + + use lxc && CONFIG_CHECK+=" + ~BLK_CGROUP + ~CGROUP_CPUACCT + ~CGROUP_DEVICE + ~CGROUP_FREEZER + ~CGROUP_NET_PRIO + ~CGROUP_PERF + ~CGROUPS + ~CGROUP_SCHED + ~CPUSETS + ~IPC_NS + ~MACVLAN + ~NAMESPACES + ~NET_CLS_CGROUP + ~NET_NS + ~PID_NS + ~POSIX_MQUEUE + ~SECURITYFS + ~USER_NS + ~UTS_NS + ~VETH + ~!GRKERNSEC_CHROOT_MOUNT + ~!GRKERNSEC_CHROOT_DOUBLE + ~!GRKERNSEC_CHROOT_PIVOT + ~!GRKERNSEC_CHROOT_CHMOD + ~!GRKERNSEC_CHROOT_CAPS" + + kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES" + + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_MARK_T + ~BRIDGE_NF_EBTABLES + ~NETFILTER_ADVANCED + ~NETFILTER_XT_CONNMARK + ~NETFILTER_XT_MARK + ~NETFILTER_XT_TARGET_CHECKSUM + ~IP_NF_FILTER + ~IP_NF_MANGLE + ~IP_NF_NAT + ~IP6_NF_FILTER + ~IP6_NF_MANGLE + ~IP6_NF_NAT" + + # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 + if use virt-network ; then + if kernel_is -lt 5 2 ; then + CONFIG_CHECK+=" + ~IP_NF_TARGET_MASQUERADE" + else + CONFIG_CHECK+=" + ~NETFILTER_XT_TARGET_MASQUERADE" + fi + fi + + # Bandwidth Limiting Support + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_T_NAT + ~IP_NF_TARGET_REJECT + ~NET_ACT_POLICE + ~NET_CLS_FW + ~NET_CLS_U32 + ~NET_SCH_HTB + ~NET_SCH_INGRESS + ~NET_SCH_SFQ" + + ERROR_USER_NS="Optional depending on LXC configuration." + + if [[ -n ${CONFIG_CHECK} ]]; then + linux-info_pkg_setup + fi + + python-any-r1_pkg_setup +} + +src_prepare() { + touch "${S}/.mailmap" || die + + default + python_fix_shebang . + + # Skip fragile tests which relies on pristine environment + # (Breaks because of sandbox environment variables) + # bug #802876 + sed -i -e "/commandtest/d" tests/meson.build || die + + # Tweak the init script: + cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die + sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ + -i "${S}/libvirtd.init" || die "sed failed" +} + +src_configure() { + local emesonargs=( + $(meson_feature apparmor) + $(meson_feature apparmor apparmor_profiles) + $(meson_feature audit) + $(meson_feature caps capng) + $(meson_feature dtrace) + $(meson_feature firewalld) + $(meson_feature fuse) + $(meson_feature glusterfs) + $(meson_feature glusterfs storage_gluster) + $(meson_feature iscsi storage_iscsi) + $(meson_feature iscsi-direct storage_iscsi_direct) + $(meson_feature libvirtd driver_libvirtd) + $(meson_feature libssh) + $(meson_feature libssh2) + $(meson_feature lvm storage_lvm) + $(meson_feature lvm storage_mpath) + $(meson_feature lxc driver_lxc) + $(meson_feature nbd nbdkit) + $(meson_feature nls) + $(meson_feature numa numactl) + $(meson_feature numa numad) + $(meson_feature openvz driver_openvz) + $(meson_feature parted storage_disk) + $(meson_feature pcap libpcap) + $(meson_feature policykit polkit) + $(meson_feature qemu driver_qemu) + $(meson_feature qemu yajl) + $(meson_feature rbd storage_rbd) + $(meson_feature sasl) + $(meson_feature selinux) + $(meson_feature test tests) + $(meson_feature udev) + $(meson_feature virt-network driver_network) + $(meson_feature virtualbox driver_vbox) + $(meson_feature wireshark-plugins wireshark_dissector) + $(meson_feature xen driver_libxl) + $(meson_feature zfs storage_zfs) + + -Dnetcf=disabled + -Dsanlock=disabled + -Dopenwsman=disabled + + -Ddriver_esx=enabled + -Dinit_script=systemd + -Dqemu_user=$(usex caps qemu root) + -Dqemu_group=$(usex caps qemu root) + -Ddriver_remote=enabled + -Dstorage_fs=enabled + -Ddriver_vmware=enabled + + --localstatedir="${EPREFIX}/var" + -Dinitconfdir="${EPREFIX}/etc/systemd" + -Drunstatedir="${EPREFIX}/run" + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + ) + + meson_src_configure +} + +src_test() { + export VIR_TEST_DEBUG=1 + # Don't run the syntax check tests, they're fragile and not relevant + # to us downstream anyway. + # We also crank up the timeout (as Fedora does) just to preempt failures + # on slower arches. + meson_src_test --no-suite syntax-check --timeout-multiplier 10 +} + +src_install() { + meson_src_install + + # Depending on configuration option, libvirt will create some bogus + # directoreis. They are either not used, or libvirtd is able to create + # them on demand, so let's remove them. + # + # Note, we are using -f here so that rm does not fail or warn if the + # directory is nonexistent. + rm -rf "${D}"/etc/sysconfig + rm -rf "${D}"/var + rm -rf "${D}"/run + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf + + newinitd "${S}/libvirtd.init" libvirtd + newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests + newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd + newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd + + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests + + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +pkg_postinst() { + if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then + touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die + fi + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + tmpfiles_process libvirtd.conf + readme.gentoo_print_elog +} diff --git a/app-emulation/libvirt/libvirt-10.1.0.ebuild b/app-emulation/libvirt/libvirt-10.1.0.ebuild deleted file mode 100644 index 38baa163aaa0..000000000000 --- a/app-emulation/libvirt/libvirt-10.1.0.ebuild +++ /dev/null @@ -1,365 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Packages which get releases together: -# app-emacs/nxml-libvirt-schemas -# dev-python/libvirt-python -# dev-perl/Sys-Virt -# app-emulation/libvirt -# Please bump them together! - -PYTHON_COMPAT=( python3_{10..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc -inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" - EGIT_BRANCH="master" -else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz - verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -fi - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -IUSE=" - apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs - iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa - openvz parted pcap policykit +qemu rbd sasl selinux test +udev - virtiofsd virtualbox +virt-network wireshark-plugins xen zfs -" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - firewalld? ( virt-network ) - libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) - lxc? ( caps libvirtd ) - openvz? ( libvirtd ) - qemu? ( libvirtd ) - virt-network? ( libvirtd ) - virtualbox? ( libvirtd ) - xen? ( libvirtd )" - -BDEPEND=" - app-text/xhtml1 - dev-lang/perl - dev-libs/libxslt - dev-perl/XML-XPath - dev-python/docutils - virtual/pkgconfig - bash-completion? ( >=app-shells/bash-completion-2.0 ) - verify-sig? ( sec-keys/openpgp-keys-libvirt )" - -# gettext.sh command is used by the libvirt command wrappers, and it's -# non-optional, so put it into RDEPEND. -# We can use both libnl:1.1 and libnl:3, but if you have both installed, the -# package will use 3 by default. Since we don't have slot pinning in an API, -# we must go with the most recent. -RDEPEND=" - acct-user/qemu - app-misc/scrub - >=dev-libs/glib-2.56.0 - dev-libs/libgcrypt - dev-libs/libnl:3 - >=dev-libs/libxml2-2.9.1 - >=net-analyzer/openbsd-netcat-1.105-r1 - >=net-libs/gnutls-3.2.0:= - net-libs/libtirpc:= - >=net-misc/curl-7.18.0 - sys-apps/dbus - sys-apps/dmidecode - sys-devel/gettext - >=sys-libs/readline-7.0:= - virtual/acl - apparmor? ( sys-libs/libapparmor ) - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap-ng ) - dtrace? ( dev-debug/systemtap ) - firewalld? ( >=net-firewall/firewalld-0.6.3 ) - fuse? ( sys-fs/fuse:= ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( >=sys-block/open-iscsi-1.18.0 ) - iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) - libssh? ( >=net-libs/libssh-0.8.1:= ) - libssh2? ( >=net-libs/libssh2-1.3 ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) - lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) - nbd? ( sys-block/nbdkit ) - nfs? ( net-fs/nfs-utils ) - numa? ( - >sys-process/numactl-2.0.2 - sys-process/numad - ) - parted? ( - >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[lvm] - ) - pcap? ( >=net-libs/libpcap-1.8.0 ) - policykit? ( - acct-group/libvirt - >=sys-auth/polkit-0.9 - ) - qemu? ( - >=app-emulation/qemu-4.2 - app-crypt/swtpm - >=dev-libs/yajl-2.0.3:= - ) - rbd? ( sys-cluster/ceph ) - sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) - selinux? ( >=sys-libs/libselinux-2.0.85 ) - virt-network? ( - net-dns/dnsmasq[dhcp,ipv6(+),script] - net-firewall/ebtables - >=net-firewall/iptables-1.4.10[ipv6(+)] - net-misc/radvd - sys-apps/iproute2[-minimal] - ) - virtiofsd? ( app-emulation/virtiofsd ) - wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) - xen? ( - >=app-emulation/xen-4.9.0 - app-emulation/xen-tools:= - ) - udev? ( - virtual/libudev:= - >=x11-libs/libpciaccess-0.10.9 - ) - zfs? ( sys-fs/zfs ) - kernel_linux? ( sys-apps/util-linux )" -DEPEND=" - ${BDEPEND} - ${RDEPEND} - ${PYTHON_DEPS} -" -# The 'circular' dependency on dev-python/libvirt-python is because of -# virt-qemu-qmp-proxy. -PDEPEND=" - qemu? ( dev-python/libvirt-python ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch - "${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch -) - -pkg_setup() { - # Check kernel configuration: - CONFIG_CHECK="" - use fuse && CONFIG_CHECK+=" - ~FUSE_FS" - - use lvm && CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_MULTIPATH - ~DM_SNAPSHOT" - - use lxc && CONFIG_CHECK+=" - ~BLK_CGROUP - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_FREEZER - ~CGROUP_NET_PRIO - ~CGROUP_PERF - ~CGROUPS - ~CGROUP_SCHED - ~CPUSETS - ~IPC_NS - ~MACVLAN - ~NAMESPACES - ~NET_CLS_CGROUP - ~NET_NS - ~PID_NS - ~POSIX_MQUEUE - ~SECURITYFS - ~USER_NS - ~UTS_NS - ~VETH - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS" - - kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES" - - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_MARK_T - ~BRIDGE_NF_EBTABLES - ~NETFILTER_ADVANCED - ~NETFILTER_XT_CONNMARK - ~NETFILTER_XT_MARK - ~NETFILTER_XT_TARGET_CHECKSUM - ~IP_NF_FILTER - ~IP_NF_MANGLE - ~IP_NF_NAT - ~IP6_NF_FILTER - ~IP6_NF_MANGLE - ~IP6_NF_NAT" - - # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 - if use virt-network ; then - if kernel_is -lt 5 2 ; then - CONFIG_CHECK+=" - ~IP_NF_TARGET_MASQUERADE" - else - CONFIG_CHECK+=" - ~NETFILTER_XT_TARGET_MASQUERADE" - fi - fi - - # Bandwidth Limiting Support - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_T_NAT - ~IP_NF_TARGET_REJECT - ~NET_ACT_POLICE - ~NET_CLS_FW - ~NET_CLS_U32 - ~NET_SCH_HTB - ~NET_SCH_INGRESS - ~NET_SCH_SFQ" - - ERROR_USER_NS="Optional depending on LXC configuration." - - if [[ -n ${CONFIG_CHECK} ]]; then - linux-info_pkg_setup - fi - - python-any-r1_pkg_setup -} - -src_prepare() { - touch "${S}/.mailmap" || die - - default - python_fix_shebang . - - # Skip fragile tests which relies on pristine environment - # (Breaks because of sandbox environment variables) - # bug #802876 - sed -i -e "/commandtest/d" tests/meson.build || die - - # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die - sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ - -i "${S}/libvirtd.init" || die "sed failed" -} - -src_configure() { - local emesonargs=( - $(meson_feature apparmor) - $(meson_feature apparmor apparmor_profiles) - $(meson_feature audit) - $(meson_feature caps capng) - $(meson_feature dtrace) - $(meson_feature firewalld) - $(meson_feature fuse) - $(meson_feature glusterfs) - $(meson_feature glusterfs storage_gluster) - $(meson_feature iscsi storage_iscsi) - $(meson_feature iscsi-direct storage_iscsi_direct) - $(meson_feature libvirtd driver_libvirtd) - $(meson_feature libssh) - $(meson_feature libssh2) - $(meson_feature lvm storage_lvm) - $(meson_feature lvm storage_mpath) - $(meson_feature lxc driver_lxc) - $(meson_feature nbd nbdkit) - $(meson_feature nls) - $(meson_feature numa numactl) - $(meson_feature numa numad) - $(meson_feature openvz driver_openvz) - $(meson_feature parted storage_disk) - $(meson_feature pcap libpcap) - $(meson_feature policykit polkit) - $(meson_feature qemu driver_qemu) - $(meson_feature qemu yajl) - $(meson_feature rbd storage_rbd) - $(meson_feature sasl) - $(meson_feature selinux) - $(meson_feature test tests) - $(meson_feature udev) - $(meson_feature virt-network driver_network) - $(meson_feature virtualbox driver_vbox) - $(meson_feature wireshark-plugins wireshark_dissector) - $(meson_feature xen driver_libxl) - $(meson_feature zfs storage_zfs) - - -Dnetcf=disabled - -Dsanlock=disabled - -Dopenwsman=disabled - - -Ddriver_esx=enabled - -Dinit_script=systemd - -Dqemu_user=$(usex caps qemu root) - -Dqemu_group=$(usex caps qemu root) - -Ddriver_remote=enabled - -Dstorage_fs=enabled - -Ddriver_vmware=enabled - - --localstatedir="${EPREFIX}/var" - -Dinitconfdir="${EPREFIX}/etc/systemd" - -Drunstatedir="${EPREFIX}/run" - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - ) - - meson_src_configure -} - -src_test() { - export VIR_TEST_DEBUG=1 - # Don't run the syntax check tests, they're fragile and not relevant - # to us downstream anyway. - # We also crank up the timeout (as Fedora does) just to preempt failures - # on slower arches. - meson_src_test --no-suite syntax-check --timeout-multiplier 10 -} - -src_install() { - meson_src_install - - # Depending on configuration option, libvirt will create some bogus - # directoreis. They are either not used, or libvirtd is able to create - # them on demand, so let's remove them. - # - # Note, we are using -f here so that rm does not fail or warn if the - # directory is nonexistent. - rm -rf "${D}"/etc/sysconfig - rm -rf "${D}"/var - rm -rf "${D}"/run - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - - newinitd "${S}/libvirtd.init" libvirtd - newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests - newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd - newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd - - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -pkg_postinst() { - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die - fi - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - tmpfiles_process libvirtd.conf - readme.gentoo_print_elog -} diff --git a/app-emulation/libvirt/libvirt-10.2.0.ebuild b/app-emulation/libvirt/libvirt-10.2.0.ebuild new file mode 100644 index 000000000000..f1c08714d713 --- /dev/null +++ b/app-emulation/libvirt/libvirt-10.2.0.ebuild @@ -0,0 +1,365 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Packages which get releases together: +# app-emacs/nxml-libvirt-schemas +# dev-python/libvirt-python +# dev-perl/Sys-Virt +# app-emulation/libvirt +# Please bump them together! + +PYTHON_COMPAT=( python3_{10..12} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc +inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" + EGIT_BRANCH="master" +else + SRC_URI="https://libvirt.org/sources/${P}.tar.xz + verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +fi + +DESCRIPTION="C toolkit to manipulate virtual machines" +HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +IUSE=" + apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs + iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa + openvz parted pcap policykit +qemu rbd sasl selinux test +udev + virtiofsd virtualbox +virt-network wireshark-plugins xen zfs +" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + firewalld? ( virt-network ) + libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) + lxc? ( caps libvirtd ) + openvz? ( libvirtd ) + qemu? ( libvirtd ) + virt-network? ( libvirtd ) + virtualbox? ( libvirtd ) + xen? ( libvirtd )" + +BDEPEND=" + app-text/xhtml1 + dev-lang/perl + dev-libs/libxslt + dev-perl/XML-XPath + dev-python/docutils + virtual/pkgconfig + bash-completion? ( >=app-shells/bash-completion-2.0 ) + verify-sig? ( sec-keys/openpgp-keys-libvirt )" + +# gettext.sh command is used by the libvirt command wrappers, and it's +# non-optional, so put it into RDEPEND. +# We can use both libnl:1.1 and libnl:3, but if you have both installed, the +# package will use 3 by default. Since we don't have slot pinning in an API, +# we must go with the most recent. +RDEPEND=" + acct-user/qemu + app-misc/scrub + >=dev-libs/glib-2.56.0 + dev-libs/libgcrypt + dev-libs/libnl:3 + >=dev-libs/libxml2-2.9.1 + >=net-analyzer/openbsd-netcat-1.105-r1 + >=net-libs/gnutls-3.2.0:= + net-libs/libtirpc:= + >=net-misc/curl-7.18.0 + sys-apps/dbus + sys-apps/dmidecode + sys-devel/gettext + >=sys-libs/readline-7.0:= + virtual/acl + apparmor? ( sys-libs/libapparmor ) + audit? ( sys-process/audit ) + caps? ( sys-libs/libcap-ng ) + dtrace? ( dev-debug/systemtap ) + firewalld? ( >=net-firewall/firewalld-0.6.3 ) + fuse? ( sys-fs/fuse:= ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) + iscsi? ( >=sys-block/open-iscsi-1.18.0 ) + iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) + libssh? ( >=net-libs/libssh-0.8.1:= ) + libssh2? ( >=net-libs/libssh2-1.3 ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) + lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) + nbd? ( sys-block/nbdkit ) + nfs? ( net-fs/nfs-utils ) + numa? ( + >sys-process/numactl-2.0.2 + sys-process/numad + ) + parted? ( + >=sys-block/parted-1.8[device-mapper] + sys-fs/lvm2[lvm] + ) + pcap? ( >=net-libs/libpcap-1.8.0 ) + policykit? ( + acct-group/libvirt + >=sys-auth/polkit-0.9 + ) + qemu? ( + >=app-emulation/qemu-4.2 + app-crypt/swtpm + >=dev-libs/yajl-2.0.3:= + ) + rbd? ( sys-cluster/ceph ) + sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) + selinux? ( >=sys-libs/libselinux-2.0.85 ) + virt-network? ( + net-dns/dnsmasq[dhcp,ipv6(+),script] + net-firewall/ebtables + >=net-firewall/iptables-1.4.10[ipv6(+)] + net-misc/radvd + sys-apps/iproute2[-minimal] + ) + virtiofsd? ( app-emulation/virtiofsd ) + wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) + xen? ( + >=app-emulation/xen-4.9.0 + app-emulation/xen-tools:= + ) + udev? ( + virtual/libudev:= + >=x11-libs/libpciaccess-0.10.9 + ) + zfs? ( sys-fs/zfs ) + kernel_linux? ( sys-apps/util-linux )" +DEPEND=" + ${BDEPEND} + ${RDEPEND} + ${PYTHON_DEPS} +" +# The 'circular' dependency on dev-python/libvirt-python is because of +# virt-qemu-qmp-proxy. +PDEPEND=" + qemu? ( dev-python/libvirt-python ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch + "${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch + "${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch +) + +pkg_setup() { + # Check kernel configuration: + CONFIG_CHECK="" + use fuse && CONFIG_CHECK+=" + ~FUSE_FS" + + use lvm && CONFIG_CHECK+=" + ~BLK_DEV_DM + ~DM_MULTIPATH + ~DM_SNAPSHOT" + + use lxc && CONFIG_CHECK+=" + ~BLK_CGROUP + ~CGROUP_CPUACCT + ~CGROUP_DEVICE + ~CGROUP_FREEZER + ~CGROUP_NET_PRIO + ~CGROUP_PERF + ~CGROUPS + ~CGROUP_SCHED + ~CPUSETS + ~IPC_NS + ~MACVLAN + ~NAMESPACES + ~NET_CLS_CGROUP + ~NET_NS + ~PID_NS + ~POSIX_MQUEUE + ~SECURITYFS + ~USER_NS + ~UTS_NS + ~VETH + ~!GRKERNSEC_CHROOT_MOUNT + ~!GRKERNSEC_CHROOT_DOUBLE + ~!GRKERNSEC_CHROOT_PIVOT + ~!GRKERNSEC_CHROOT_CHMOD + ~!GRKERNSEC_CHROOT_CAPS" + + kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES" + + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_MARK_T + ~BRIDGE_NF_EBTABLES + ~NETFILTER_ADVANCED + ~NETFILTER_XT_CONNMARK + ~NETFILTER_XT_MARK + ~NETFILTER_XT_TARGET_CHECKSUM + ~IP_NF_FILTER + ~IP_NF_MANGLE + ~IP_NF_NAT + ~IP6_NF_FILTER + ~IP6_NF_MANGLE + ~IP6_NF_NAT" + + # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 + if use virt-network ; then + if kernel_is -lt 5 2 ; then + CONFIG_CHECK+=" + ~IP_NF_TARGET_MASQUERADE" + else + CONFIG_CHECK+=" + ~NETFILTER_XT_TARGET_MASQUERADE" + fi + fi + + # Bandwidth Limiting Support + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_T_NAT + ~IP_NF_TARGET_REJECT + ~NET_ACT_POLICE + ~NET_CLS_FW + ~NET_CLS_U32 + ~NET_SCH_HTB + ~NET_SCH_INGRESS + ~NET_SCH_SFQ" + + ERROR_USER_NS="Optional depending on LXC configuration." + + if [[ -n ${CONFIG_CHECK} ]]; then + linux-info_pkg_setup + fi + + python-any-r1_pkg_setup +} + +src_prepare() { + touch "${S}/.mailmap" || die + + default + python_fix_shebang . + + # Skip fragile tests which relies on pristine environment + # (Breaks because of sandbox environment variables) + # bug #802876 + sed -i -e "/commandtest/d" tests/meson.build || die + + # Tweak the init script: + cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die + sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ + -i "${S}/libvirtd.init" || die "sed failed" +} + +src_configure() { + local emesonargs=( + $(meson_feature apparmor) + $(meson_feature apparmor apparmor_profiles) + $(meson_feature audit) + $(meson_feature caps capng) + $(meson_feature dtrace) + $(meson_feature firewalld) + $(meson_feature fuse) + $(meson_feature glusterfs) + $(meson_feature glusterfs storage_gluster) + $(meson_feature iscsi storage_iscsi) + $(meson_feature iscsi-direct storage_iscsi_direct) + $(meson_feature libvirtd driver_libvirtd) + $(meson_feature libssh) + $(meson_feature libssh2) + $(meson_feature lvm storage_lvm) + $(meson_feature lvm storage_mpath) + $(meson_feature lxc driver_lxc) + $(meson_feature nbd nbdkit) + $(meson_feature nls) + $(meson_feature numa numactl) + $(meson_feature numa numad) + $(meson_feature openvz driver_openvz) + $(meson_feature parted storage_disk) + $(meson_feature pcap libpcap) + $(meson_feature policykit polkit) + $(meson_feature qemu driver_qemu) + $(meson_feature qemu yajl) + $(meson_feature rbd storage_rbd) + $(meson_feature sasl) + $(meson_feature selinux) + $(meson_feature test tests) + $(meson_feature udev) + $(meson_feature virt-network driver_network) + $(meson_feature virtualbox driver_vbox) + $(meson_feature wireshark-plugins wireshark_dissector) + $(meson_feature xen driver_libxl) + $(meson_feature zfs storage_zfs) + + -Dnetcf=disabled + -Dsanlock=disabled + -Dopenwsman=disabled + + -Ddriver_esx=enabled + -Dinit_script=systemd + -Dqemu_user=$(usex caps qemu root) + -Dqemu_group=$(usex caps qemu root) + -Ddriver_remote=enabled + -Dstorage_fs=enabled + -Ddriver_vmware=enabled + + --localstatedir="${EPREFIX}/var" + -Dinitconfdir="${EPREFIX}/etc/systemd" + -Drunstatedir="${EPREFIX}/run" + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + ) + + meson_src_configure +} + +src_test() { + export VIR_TEST_DEBUG=1 + # Don't run the syntax check tests, they're fragile and not relevant + # to us downstream anyway. + # We also crank up the timeout (as Fedora does) just to preempt failures + # on slower arches. + meson_src_test --no-suite syntax-check --timeout-multiplier 10 +} + +src_install() { + meson_src_install + + # Depending on configuration option, libvirt will create some bogus + # directoreis. They are either not used, or libvirtd is able to create + # them on demand, so let's remove them. + # + # Note, we are using -f here so that rm does not fail or warn if the + # directory is nonexistent. + rm -rf "${D}"/etc/sysconfig + rm -rf "${D}"/var + rm -rf "${D}"/run + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf + + newinitd "${S}/libvirtd.init" libvirtd + newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests + newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd + newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd + + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests + + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +pkg_postinst() { + if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then + touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die + fi + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + tmpfiles_process libvirtd.conf + readme.gentoo_print_elog +} diff --git a/app-emulation/libvirt/libvirt-9.8.0-r1.ebuild b/app-emulation/libvirt/libvirt-9.8.0-r1.ebuild deleted file mode 100644 index 425a8cb1d985..000000000000 --- a/app-emulation/libvirt/libvirt-9.8.0-r1.ebuild +++ /dev/null @@ -1,364 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Packages which get releases together: -# app-emacs/nxml-libvirt-schemas -# dev-python/libvirt-python -# dev-perl/Sys-Virt -# app-emulation/libvirt -# Please bump them together! - -PYTHON_COMPAT=( python3_{10..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc -inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" - EGIT_BRANCH="master" -else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz - verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" - KEYWORDS="amd64 ~arm arm64 ppc64 x86" -fi - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -IUSE=" - apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs - iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz - parted pcap policykit +qemu rbd sasl selinux test +udev - virtualbox +virt-network wireshark-plugins xen zfs -" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - firewalld? ( virt-network ) - libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) - lxc? ( caps libvirtd ) - openvz? ( libvirtd ) - qemu? ( libvirtd ) - virt-network? ( libvirtd ) - virtualbox? ( libvirtd ) - xen? ( libvirtd )" - -BDEPEND=" - app-text/xhtml1 - dev-lang/perl - dev-libs/libxslt - dev-perl/XML-XPath - dev-python/docutils - virtual/pkgconfig - net-libs/rpcsvc-proto - bash-completion? ( >=app-shells/bash-completion-2.0 ) - verify-sig? ( sec-keys/openpgp-keys-libvirt )" - -# gettext.sh command is used by the libvirt command wrappers, and it's -# non-optional, so put it into RDEPEND. -# We can use both libnl:1.1 and libnl:3, but if you have both installed, the -# package will use 3 by default. Since we don't have slot pinning in an API, -# we must go with the most recent. -RDEPEND=" - acct-user/qemu - app-misc/scrub - >=dev-libs/glib-2.56.0 - dev-libs/libgcrypt - dev-libs/libnl:3 - >=dev-libs/libxml2-2.9.1 - >=net-analyzer/openbsd-netcat-1.105-r1 - >=net-libs/gnutls-3.2.0:= - net-libs/libtirpc:= - >=net-misc/curl-7.18.0 - sys-apps/dbus - sys-apps/dmidecode - sys-devel/gettext - >=sys-libs/readline-7.0:= - virtual/acl - apparmor? ( sys-libs/libapparmor ) - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap-ng ) - dtrace? ( dev-debug/systemtap ) - firewalld? ( >=net-firewall/firewalld-0.6.3 ) - fuse? ( sys-fs/fuse:= ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( >=sys-block/open-iscsi-1.18.0 ) - iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) - libssh? ( >=net-libs/libssh-0.8.1:= ) - libssh2? ( >=net-libs/libssh2-1.3 ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) - lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) - nfs? ( net-fs/nfs-utils ) - numa? ( - >sys-process/numactl-2.0.2 - sys-process/numad - ) - parted? ( - >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[lvm] - ) - pcap? ( >=net-libs/libpcap-1.8.0 ) - policykit? ( - acct-group/libvirt - >=sys-auth/polkit-0.9 - ) - qemu? ( - >=app-emulation/qemu-4.2 - app-crypt/swtpm - >=dev-libs/yajl-2.0.3:= - ) - rbd? ( sys-cluster/ceph ) - sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) - selinux? ( >=sys-libs/libselinux-2.0.85 ) - virt-network? ( - net-dns/dnsmasq[dhcp,ipv6(+),script] - net-firewall/ebtables - >=net-firewall/iptables-1.4.10[ipv6(+)] - net-misc/radvd - sys-apps/iproute2[-minimal] - ) - wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) - xen? ( - >=app-emulation/xen-4.9.0 - app-emulation/xen-tools:= - ) - udev? ( - virtual/libudev:= - >=x11-libs/libpciaccess-0.10.9 - ) - zfs? ( sys-fs/zfs ) - kernel_linux? ( sys-apps/util-linux )" -DEPEND=" - ${BDEPEND} - ${RDEPEND} - ${PYTHON_DEPS} -" -# The 'circular' dependency on dev-python/libvirt-python is because of -# virt-qemu-qmp-proxy. -PDEPEND=" - qemu? ( dev-python/libvirt-python ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch - "${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch - "${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch -) - -pkg_setup() { - # Check kernel configuration: - CONFIG_CHECK="" - use fuse && CONFIG_CHECK+=" - ~FUSE_FS" - - use lvm && CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_MULTIPATH - ~DM_SNAPSHOT" - - use lxc && CONFIG_CHECK+=" - ~BLK_CGROUP - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_FREEZER - ~CGROUP_NET_PRIO - ~CGROUP_PERF - ~CGROUPS - ~CGROUP_SCHED - ~CPUSETS - ~IPC_NS - ~MACVLAN - ~NAMESPACES - ~NET_CLS_CGROUP - ~NET_NS - ~PID_NS - ~POSIX_MQUEUE - ~SECURITYFS - ~USER_NS - ~UTS_NS - ~VETH - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS" - - kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES" - - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_MARK_T - ~BRIDGE_NF_EBTABLES - ~NETFILTER_ADVANCED - ~NETFILTER_XT_CONNMARK - ~NETFILTER_XT_MARK - ~NETFILTER_XT_TARGET_CHECKSUM - ~IP_NF_FILTER - ~IP_NF_MANGLE - ~IP_NF_NAT - ~IP6_NF_FILTER - ~IP6_NF_MANGLE - ~IP6_NF_NAT" - - # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 - if use virt-network ; then - if kernel_is -lt 5 2 ; then - CONFIG_CHECK+=" - ~IP_NF_TARGET_MASQUERADE" - else - CONFIG_CHECK+=" - ~NETFILTER_XT_TARGET_MASQUERADE" - fi - fi - - # Bandwidth Limiting Support - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_T_NAT - ~IP_NF_TARGET_REJECT - ~NET_ACT_POLICE - ~NET_CLS_FW - ~NET_CLS_U32 - ~NET_SCH_HTB - ~NET_SCH_INGRESS - ~NET_SCH_SFQ" - - ERROR_USER_NS="Optional depending on LXC configuration." - - if [[ -n ${CONFIG_CHECK} ]]; then - linux-info_pkg_setup - fi - - python-any-r1_pkg_setup -} - -src_prepare() { - touch "${S}/.mailmap" || die - - default - python_fix_shebang . - - # Skip fragile tests which relies on pristine environment - # (Breaks because of sandbox environment variables) - # bug #802876 - sed -i -e "/commandtest/d" tests/meson.build || die - - # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die - sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ - -i "${S}/libvirtd.init" || die "sed failed" -} - -src_configure() { - local emesonargs=( - $(meson_feature apparmor) - $(meson_feature apparmor apparmor_profiles) - $(meson_feature audit) - $(meson_feature caps capng) - $(meson_feature dtrace) - $(meson_feature firewalld) - $(meson_feature fuse) - $(meson_feature glusterfs) - $(meson_feature glusterfs storage_gluster) - $(meson_feature iscsi storage_iscsi) - $(meson_feature iscsi-direct storage_iscsi_direct) - $(meson_feature libvirtd driver_libvirtd) - $(meson_feature libssh) - $(meson_feature libssh2) - $(meson_feature lvm storage_lvm) - $(meson_feature lvm storage_mpath) - $(meson_feature lxc driver_lxc) - $(meson_feature nls) - $(meson_feature numa numactl) - $(meson_feature numa numad) - $(meson_feature openvz driver_openvz) - $(meson_feature parted storage_disk) - $(meson_feature pcap libpcap) - $(meson_feature policykit polkit) - $(meson_feature qemu driver_qemu) - $(meson_feature qemu yajl) - $(meson_feature rbd storage_rbd) - $(meson_feature sasl) - $(meson_feature selinux) - $(meson_feature test tests) - $(meson_feature udev) - $(meson_feature virt-network driver_network) - $(meson_feature virtualbox driver_vbox) - $(meson_feature wireshark-plugins wireshark_dissector) - $(meson_feature xen driver_libxl) - $(meson_feature zfs storage_zfs) - - -Dnetcf=disabled - -Dsanlock=disabled - -Dopenwsman=disabled - - -Ddriver_esx=enabled - -Dinit_script=systemd - -Dqemu_user=$(usex caps qemu root) - -Dqemu_group=$(usex caps qemu root) - -Ddriver_remote=enabled - -Dstorage_fs=enabled - -Ddriver_vmware=enabled - - --localstatedir="${EPREFIX}/var" - -Dinitconfdir="${EPREFIX}/etc/systemd" - -Drunstatedir="${EPREFIX}/run" - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - ) - - meson_src_configure -} - -src_test() { - export VIR_TEST_DEBUG=1 - # Don't run the syntax check tests, they're fragile and not relevant - # to us downstream anyway. - # We also crank up the timeout (as Fedora does) just to preempt failures - # on slower arches. - meson_src_test --no-suite syntax-check --timeout-multiplier 10 -} - -src_install() { - meson_src_install - - # Depending on configuration option, libvirt will create some bogus - # directoreis. They are either not used, or libvirtd is able to create - # them on demand, so let's remove them. - # - # Note, we are using -f here so that rm does not fail or warn if the - # directory is nonexistent. - rm -rf "${D}"/etc/sysconfig - rm -rf "${D}"/var - rm -rf "${D}"/run - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - - newinitd "${S}/libvirtd.init" libvirtd - newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests - newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd - newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd - - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -pkg_postinst() { - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die - fi - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - tmpfiles_process libvirtd.conf - readme.gentoo_print_elog -} diff --git a/app-emulation/libvirt/libvirt-9.8.0-r2.ebuild b/app-emulation/libvirt/libvirt-9.8.0-r2.ebuild new file mode 100644 index 000000000000..500ab7f572ad --- /dev/null +++ b/app-emulation/libvirt/libvirt-9.8.0-r2.ebuild @@ -0,0 +1,366 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Packages which get releases together: +# app-emacs/nxml-libvirt-schemas +# dev-python/libvirt-python +# dev-perl/Sys-Virt +# app-emulation/libvirt +# Please bump them together! + +PYTHON_COMPAT=( python3_{10..12} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc +inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" + EGIT_BRANCH="master" +else + SRC_URI="https://libvirt.org/sources/${P}.tar.xz + verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" + KEYWORDS="amd64 ~arm arm64 ppc64 x86" +fi + +DESCRIPTION="C toolkit to manipulate virtual machines" +HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +IUSE=" + apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs + iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz + parted pcap policykit +qemu rbd sasl selinux test +udev + virtualbox +virt-network wireshark-plugins xen zfs +" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + firewalld? ( virt-network ) + libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) + lxc? ( caps libvirtd ) + openvz? ( libvirtd ) + qemu? ( libvirtd ) + virt-network? ( libvirtd ) + virtualbox? ( libvirtd ) + xen? ( libvirtd )" + +BDEPEND=" + app-text/xhtml1 + dev-lang/perl + dev-libs/libxslt + dev-perl/XML-XPath + dev-python/docutils + virtual/pkgconfig + net-libs/rpcsvc-proto + bash-completion? ( >=app-shells/bash-completion-2.0 ) + verify-sig? ( sec-keys/openpgp-keys-libvirt )" + +# gettext.sh command is used by the libvirt command wrappers, and it's +# non-optional, so put it into RDEPEND. +# We can use both libnl:1.1 and libnl:3, but if you have both installed, the +# package will use 3 by default. Since we don't have slot pinning in an API, +# we must go with the most recent. +RDEPEND=" + acct-user/qemu + app-misc/scrub + >=dev-libs/glib-2.56.0 + dev-libs/libgcrypt + dev-libs/libnl:3 + >=dev-libs/libxml2-2.9.1 + >=net-analyzer/openbsd-netcat-1.105-r1 + >=net-libs/gnutls-3.2.0:= + net-libs/libtirpc:= + >=net-misc/curl-7.18.0 + sys-apps/dbus + sys-apps/dmidecode + sys-devel/gettext + >=sys-libs/readline-7.0:= + virtual/acl + apparmor? ( sys-libs/libapparmor ) + audit? ( sys-process/audit ) + caps? ( sys-libs/libcap-ng ) + dtrace? ( dev-debug/systemtap ) + firewalld? ( >=net-firewall/firewalld-0.6.3 ) + fuse? ( sys-fs/fuse:= ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) + iscsi? ( >=sys-block/open-iscsi-1.18.0 ) + iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) + libssh? ( >=net-libs/libssh-0.8.1:= ) + libssh2? ( >=net-libs/libssh2-1.3 ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) + lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) + nfs? ( net-fs/nfs-utils ) + numa? ( + >sys-process/numactl-2.0.2 + sys-process/numad + ) + parted? ( + >=sys-block/parted-1.8[device-mapper] + sys-fs/lvm2[lvm] + ) + pcap? ( >=net-libs/libpcap-1.8.0 ) + policykit? ( + acct-group/libvirt + >=sys-auth/polkit-0.9 + ) + qemu? ( + >=app-emulation/qemu-4.2 + app-crypt/swtpm + >=dev-libs/yajl-2.0.3:= + ) + rbd? ( sys-cluster/ceph ) + sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) + selinux? ( >=sys-libs/libselinux-2.0.85 ) + virt-network? ( + net-dns/dnsmasq[dhcp,ipv6(+),script] + net-firewall/ebtables + >=net-firewall/iptables-1.4.10[ipv6(+)] + net-misc/radvd + sys-apps/iproute2[-minimal] + ) + wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) + xen? ( + >=app-emulation/xen-4.9.0 + app-emulation/xen-tools:= + ) + udev? ( + virtual/libudev:= + >=x11-libs/libpciaccess-0.10.9 + ) + zfs? ( sys-fs/zfs ) + kernel_linux? ( sys-apps/util-linux )" +DEPEND=" + ${BDEPEND} + ${RDEPEND} + ${PYTHON_DEPS} +" +# The 'circular' dependency on dev-python/libvirt-python is because of +# virt-qemu-qmp-proxy. +PDEPEND=" + qemu? ( dev-python/libvirt-python ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch + "${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch + "${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch + "${FILESDIR}"/${PN}-10.1.0-Fix-off-by-one-error-in-udevListInterfacesByStatus.patch + "${FILESDIR}"/${PN}-10.2.0-remote-check-for-negative-array-lengths-before-alloc.patch +) + +pkg_setup() { + # Check kernel configuration: + CONFIG_CHECK="" + use fuse && CONFIG_CHECK+=" + ~FUSE_FS" + + use lvm && CONFIG_CHECK+=" + ~BLK_DEV_DM + ~DM_MULTIPATH + ~DM_SNAPSHOT" + + use lxc && CONFIG_CHECK+=" + ~BLK_CGROUP + ~CGROUP_CPUACCT + ~CGROUP_DEVICE + ~CGROUP_FREEZER + ~CGROUP_NET_PRIO + ~CGROUP_PERF + ~CGROUPS + ~CGROUP_SCHED + ~CPUSETS + ~IPC_NS + ~MACVLAN + ~NAMESPACES + ~NET_CLS_CGROUP + ~NET_NS + ~PID_NS + ~POSIX_MQUEUE + ~SECURITYFS + ~USER_NS + ~UTS_NS + ~VETH + ~!GRKERNSEC_CHROOT_MOUNT + ~!GRKERNSEC_CHROOT_DOUBLE + ~!GRKERNSEC_CHROOT_PIVOT + ~!GRKERNSEC_CHROOT_CHMOD + ~!GRKERNSEC_CHROOT_CAPS" + + kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES" + + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_MARK_T + ~BRIDGE_NF_EBTABLES + ~NETFILTER_ADVANCED + ~NETFILTER_XT_CONNMARK + ~NETFILTER_XT_MARK + ~NETFILTER_XT_TARGET_CHECKSUM + ~IP_NF_FILTER + ~IP_NF_MANGLE + ~IP_NF_NAT + ~IP6_NF_FILTER + ~IP6_NF_MANGLE + ~IP6_NF_NAT" + + # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 + if use virt-network ; then + if kernel_is -lt 5 2 ; then + CONFIG_CHECK+=" + ~IP_NF_TARGET_MASQUERADE" + else + CONFIG_CHECK+=" + ~NETFILTER_XT_TARGET_MASQUERADE" + fi + fi + + # Bandwidth Limiting Support + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_T_NAT + ~IP_NF_TARGET_REJECT + ~NET_ACT_POLICE + ~NET_CLS_FW + ~NET_CLS_U32 + ~NET_SCH_HTB + ~NET_SCH_INGRESS + ~NET_SCH_SFQ" + + ERROR_USER_NS="Optional depending on LXC configuration." + + if [[ -n ${CONFIG_CHECK} ]]; then + linux-info_pkg_setup + fi + + python-any-r1_pkg_setup +} + +src_prepare() { + touch "${S}/.mailmap" || die + + default + python_fix_shebang . + + # Skip fragile tests which relies on pristine environment + # (Breaks because of sandbox environment variables) + # bug #802876 + sed -i -e "/commandtest/d" tests/meson.build || die + + # Tweak the init script: + cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die + sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ + -i "${S}/libvirtd.init" || die "sed failed" +} + +src_configure() { + local emesonargs=( + $(meson_feature apparmor) + $(meson_feature apparmor apparmor_profiles) + $(meson_feature audit) + $(meson_feature caps capng) + $(meson_feature dtrace) + $(meson_feature firewalld) + $(meson_feature fuse) + $(meson_feature glusterfs) + $(meson_feature glusterfs storage_gluster) + $(meson_feature iscsi storage_iscsi) + $(meson_feature iscsi-direct storage_iscsi_direct) + $(meson_feature libvirtd driver_libvirtd) + $(meson_feature libssh) + $(meson_feature libssh2) + $(meson_feature lvm storage_lvm) + $(meson_feature lvm storage_mpath) + $(meson_feature lxc driver_lxc) + $(meson_feature nls) + $(meson_feature numa numactl) + $(meson_feature numa numad) + $(meson_feature openvz driver_openvz) + $(meson_feature parted storage_disk) + $(meson_feature pcap libpcap) + $(meson_feature policykit polkit) + $(meson_feature qemu driver_qemu) + $(meson_feature qemu yajl) + $(meson_feature rbd storage_rbd) + $(meson_feature sasl) + $(meson_feature selinux) + $(meson_feature test tests) + $(meson_feature udev) + $(meson_feature virt-network driver_network) + $(meson_feature virtualbox driver_vbox) + $(meson_feature wireshark-plugins wireshark_dissector) + $(meson_feature xen driver_libxl) + $(meson_feature zfs storage_zfs) + + -Dnetcf=disabled + -Dsanlock=disabled + -Dopenwsman=disabled + + -Ddriver_esx=enabled + -Dinit_script=systemd + -Dqemu_user=$(usex caps qemu root) + -Dqemu_group=$(usex caps qemu root) + -Ddriver_remote=enabled + -Dstorage_fs=enabled + -Ddriver_vmware=enabled + + --localstatedir="${EPREFIX}/var" + -Dinitconfdir="${EPREFIX}/etc/systemd" + -Drunstatedir="${EPREFIX}/run" + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + ) + + meson_src_configure +} + +src_test() { + export VIR_TEST_DEBUG=1 + # Don't run the syntax check tests, they're fragile and not relevant + # to us downstream anyway. + # We also crank up the timeout (as Fedora does) just to preempt failures + # on slower arches. + meson_src_test --no-suite syntax-check --timeout-multiplier 10 +} + +src_install() { + meson_src_install + + # Depending on configuration option, libvirt will create some bogus + # directoreis. They are either not used, or libvirtd is able to create + # them on demand, so let's remove them. + # + # Note, we are using -f here so that rm does not fail or warn if the + # directory is nonexistent. + rm -rf "${D}"/etc/sysconfig + rm -rf "${D}"/var + rm -rf "${D}"/run + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf + + newinitd "${S}/libvirtd.init" libvirtd + newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests + newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd + newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd + + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests + + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +pkg_postinst() { + if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then + touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die + fi + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + tmpfiles_process libvirtd.conf + readme.gentoo_print_elog +} diff --git a/app-emulation/libvirt/libvirt-9.9.0-r1.ebuild b/app-emulation/libvirt/libvirt-9.9.0-r1.ebuild deleted file mode 100644 index cc922f97df11..000000000000 --- a/app-emulation/libvirt/libvirt-9.9.0-r1.ebuild +++ /dev/null @@ -1,365 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Packages which get releases together: -# app-emacs/nxml-libvirt-schemas -# dev-python/libvirt-python -# dev-perl/Sys-Virt -# app-emulation/libvirt -# Please bump them together! - -PYTHON_COMPAT=( python3_{10..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc -inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" - EGIT_BRANCH="master" -else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz - verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -fi - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -IUSE=" - apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs - iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz - parted pcap policykit +qemu rbd sasl selinux test +udev virtiofsd - virtualbox +virt-network wireshark-plugins xen zfs -" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - firewalld? ( virt-network ) - libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) - lxc? ( caps libvirtd ) - openvz? ( libvirtd ) - qemu? ( libvirtd ) - virt-network? ( libvirtd ) - virtualbox? ( libvirtd ) - xen? ( libvirtd )" - -BDEPEND=" - app-text/xhtml1 - dev-lang/perl - dev-libs/libxslt - dev-perl/XML-XPath - dev-python/docutils - virtual/pkgconfig - net-libs/rpcsvc-proto - bash-completion? ( >=app-shells/bash-completion-2.0 ) - verify-sig? ( sec-keys/openpgp-keys-libvirt )" - -# gettext.sh command is used by the libvirt command wrappers, and it's -# non-optional, so put it into RDEPEND. -# We can use both libnl:1.1 and libnl:3, but if you have both installed, the -# package will use 3 by default. Since we don't have slot pinning in an API, -# we must go with the most recent. -RDEPEND=" - acct-user/qemu - app-misc/scrub - >=dev-libs/glib-2.56.0 - dev-libs/libgcrypt - dev-libs/libnl:3 - >=dev-libs/libxml2-2.9.1 - >=net-analyzer/openbsd-netcat-1.105-r1 - >=net-libs/gnutls-3.2.0:= - net-libs/libtirpc:= - >=net-misc/curl-7.18.0 - sys-apps/dbus - sys-apps/dmidecode - sys-devel/gettext - >=sys-libs/readline-7.0:= - virtual/acl - apparmor? ( sys-libs/libapparmor ) - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap-ng ) - dtrace? ( dev-debug/systemtap ) - firewalld? ( >=net-firewall/firewalld-0.6.3 ) - fuse? ( sys-fs/fuse:= ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( >=sys-block/open-iscsi-1.18.0 ) - iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) - libssh? ( >=net-libs/libssh-0.8.1:= ) - libssh2? ( >=net-libs/libssh2-1.3 ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) - lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) - nfs? ( net-fs/nfs-utils ) - numa? ( - >sys-process/numactl-2.0.2 - sys-process/numad - ) - parted? ( - >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[lvm] - ) - pcap? ( >=net-libs/libpcap-1.8.0 ) - policykit? ( - acct-group/libvirt - >=sys-auth/polkit-0.9 - ) - qemu? ( - >=app-emulation/qemu-4.2 - app-crypt/swtpm - >=dev-libs/yajl-2.0.3:= - ) - rbd? ( sys-cluster/ceph ) - sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) - selinux? ( >=sys-libs/libselinux-2.0.85 ) - virt-network? ( - net-dns/dnsmasq[dhcp,ipv6(+),script] - net-firewall/ebtables - >=net-firewall/iptables-1.4.10[ipv6(+)] - net-misc/radvd - sys-apps/iproute2[-minimal] - ) - virtiofsd? ( app-emulation/virtiofsd ) - wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) - xen? ( - >=app-emulation/xen-4.9.0 - app-emulation/xen-tools:= - ) - udev? ( - virtual/libudev:= - >=x11-libs/libpciaccess-0.10.9 - ) - zfs? ( sys-fs/zfs ) - kernel_linux? ( sys-apps/util-linux )" -DEPEND=" - ${BDEPEND} - ${RDEPEND} - ${PYTHON_DEPS} -" -# The 'circular' dependency on dev-python/libvirt-python is because of -# virt-qemu-qmp-proxy. -PDEPEND=" - qemu? ( dev-python/libvirt-python ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch - "${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch - "${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch -) - -pkg_setup() { - # Check kernel configuration: - CONFIG_CHECK="" - use fuse && CONFIG_CHECK+=" - ~FUSE_FS" - - use lvm && CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_MULTIPATH - ~DM_SNAPSHOT" - - use lxc && CONFIG_CHECK+=" - ~BLK_CGROUP - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_FREEZER - ~CGROUP_NET_PRIO - ~CGROUP_PERF - ~CGROUPS - ~CGROUP_SCHED - ~CPUSETS - ~IPC_NS - ~MACVLAN - ~NAMESPACES - ~NET_CLS_CGROUP - ~NET_NS - ~PID_NS - ~POSIX_MQUEUE - ~SECURITYFS - ~USER_NS - ~UTS_NS - ~VETH - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS" - - kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES" - - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_MARK_T - ~BRIDGE_NF_EBTABLES - ~NETFILTER_ADVANCED - ~NETFILTER_XT_CONNMARK - ~NETFILTER_XT_MARK - ~NETFILTER_XT_TARGET_CHECKSUM - ~IP_NF_FILTER - ~IP_NF_MANGLE - ~IP_NF_NAT - ~IP6_NF_FILTER - ~IP6_NF_MANGLE - ~IP6_NF_NAT" - - # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 - if use virt-network ; then - if kernel_is -lt 5 2 ; then - CONFIG_CHECK+=" - ~IP_NF_TARGET_MASQUERADE" - else - CONFIG_CHECK+=" - ~NETFILTER_XT_TARGET_MASQUERADE" - fi - fi - - # Bandwidth Limiting Support - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_T_NAT - ~IP_NF_TARGET_REJECT - ~NET_ACT_POLICE - ~NET_CLS_FW - ~NET_CLS_U32 - ~NET_SCH_HTB - ~NET_SCH_INGRESS - ~NET_SCH_SFQ" - - ERROR_USER_NS="Optional depending on LXC configuration." - - if [[ -n ${CONFIG_CHECK} ]]; then - linux-info_pkg_setup - fi - - python-any-r1_pkg_setup -} - -src_prepare() { - touch "${S}/.mailmap" || die - - default - python_fix_shebang . - - # Skip fragile tests which relies on pristine environment - # (Breaks because of sandbox environment variables) - # bug #802876 - sed -i -e "/commandtest/d" tests/meson.build || die - - # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die - sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ - -i "${S}/libvirtd.init" || die "sed failed" -} - -src_configure() { - local emesonargs=( - $(meson_feature apparmor) - $(meson_feature apparmor apparmor_profiles) - $(meson_feature audit) - $(meson_feature caps capng) - $(meson_feature dtrace) - $(meson_feature firewalld) - $(meson_feature fuse) - $(meson_feature glusterfs) - $(meson_feature glusterfs storage_gluster) - $(meson_feature iscsi storage_iscsi) - $(meson_feature iscsi-direct storage_iscsi_direct) - $(meson_feature libvirtd driver_libvirtd) - $(meson_feature libssh) - $(meson_feature libssh2) - $(meson_feature lvm storage_lvm) - $(meson_feature lvm storage_mpath) - $(meson_feature lxc driver_lxc) - $(meson_feature nls) - $(meson_feature numa numactl) - $(meson_feature numa numad) - $(meson_feature openvz driver_openvz) - $(meson_feature parted storage_disk) - $(meson_feature pcap libpcap) - $(meson_feature policykit polkit) - $(meson_feature qemu driver_qemu) - $(meson_feature qemu yajl) - $(meson_feature rbd storage_rbd) - $(meson_feature sasl) - $(meson_feature selinux) - $(meson_feature test tests) - $(meson_feature udev) - $(meson_feature virt-network driver_network) - $(meson_feature virtualbox driver_vbox) - $(meson_feature wireshark-plugins wireshark_dissector) - $(meson_feature xen driver_libxl) - $(meson_feature zfs storage_zfs) - - -Dnetcf=disabled - -Dsanlock=disabled - -Dopenwsman=disabled - - -Ddriver_esx=enabled - -Dinit_script=systemd - -Dqemu_user=$(usex caps qemu root) - -Dqemu_group=$(usex caps qemu root) - -Ddriver_remote=enabled - -Dstorage_fs=enabled - -Ddriver_vmware=enabled - - --localstatedir="${EPREFIX}/var" - -Dinitconfdir="${EPREFIX}/etc/systemd" - -Drunstatedir="${EPREFIX}/run" - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - ) - - meson_src_configure -} - -src_test() { - export VIR_TEST_DEBUG=1 - # Don't run the syntax check tests, they're fragile and not relevant - # to us downstream anyway. - # We also crank up the timeout (as Fedora does) just to preempt failures - # on slower arches. - meson_src_test --no-suite syntax-check --timeout-multiplier 10 -} - -src_install() { - meson_src_install - - # Depending on configuration option, libvirt will create some bogus - # directoreis. They are either not used, or libvirtd is able to create - # them on demand, so let's remove them. - # - # Note, we are using -f here so that rm does not fail or warn if the - # directory is nonexistent. - rm -rf "${D}"/etc/sysconfig - rm -rf "${D}"/var - rm -rf "${D}"/run - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - - newinitd "${S}/libvirtd.init" libvirtd - newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests - newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd - newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd - - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -pkg_postinst() { - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die - fi - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - tmpfiles_process libvirtd.conf - readme.gentoo_print_elog -} diff --git a/app-emulation/libvirt/libvirt-9.9.0-r2.ebuild b/app-emulation/libvirt/libvirt-9.9.0-r2.ebuild new file mode 100644 index 000000000000..684c0dc7afe2 --- /dev/null +++ b/app-emulation/libvirt/libvirt-9.9.0-r2.ebuild @@ -0,0 +1,367 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Packages which get releases together: +# app-emacs/nxml-libvirt-schemas +# dev-python/libvirt-python +# dev-perl/Sys-Virt +# app-emulation/libvirt +# Please bump them together! + +PYTHON_COMPAT=( python3_{10..12} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc +inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" + EGIT_BRANCH="master" +else + SRC_URI="https://libvirt.org/sources/${P}.tar.xz + verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +fi + +DESCRIPTION="C toolkit to manipulate virtual machines" +HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +IUSE=" + apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs + iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz + parted pcap policykit +qemu rbd sasl selinux test +udev virtiofsd + virtualbox +virt-network wireshark-plugins xen zfs +" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + firewalld? ( virt-network ) + libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) + lxc? ( caps libvirtd ) + openvz? ( libvirtd ) + qemu? ( libvirtd ) + virt-network? ( libvirtd ) + virtualbox? ( libvirtd ) + xen? ( libvirtd )" + +BDEPEND=" + app-text/xhtml1 + dev-lang/perl + dev-libs/libxslt + dev-perl/XML-XPath + dev-python/docutils + virtual/pkgconfig + net-libs/rpcsvc-proto + bash-completion? ( >=app-shells/bash-completion-2.0 ) + verify-sig? ( sec-keys/openpgp-keys-libvirt )" + +# gettext.sh command is used by the libvirt command wrappers, and it's +# non-optional, so put it into RDEPEND. +# We can use both libnl:1.1 and libnl:3, but if you have both installed, the +# package will use 3 by default. Since we don't have slot pinning in an API, +# we must go with the most recent. +RDEPEND=" + acct-user/qemu + app-misc/scrub + >=dev-libs/glib-2.56.0 + dev-libs/libgcrypt + dev-libs/libnl:3 + >=dev-libs/libxml2-2.9.1 + >=net-analyzer/openbsd-netcat-1.105-r1 + >=net-libs/gnutls-3.2.0:= + net-libs/libtirpc:= + >=net-misc/curl-7.18.0 + sys-apps/dbus + sys-apps/dmidecode + sys-devel/gettext + >=sys-libs/readline-7.0:= + virtual/acl + apparmor? ( sys-libs/libapparmor ) + audit? ( sys-process/audit ) + caps? ( sys-libs/libcap-ng ) + dtrace? ( dev-debug/systemtap ) + firewalld? ( >=net-firewall/firewalld-0.6.3 ) + fuse? ( sys-fs/fuse:= ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) + iscsi? ( >=sys-block/open-iscsi-1.18.0 ) + iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) + libssh? ( >=net-libs/libssh-0.8.1:= ) + libssh2? ( >=net-libs/libssh2-1.3 ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) + lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) + nfs? ( net-fs/nfs-utils ) + numa? ( + >sys-process/numactl-2.0.2 + sys-process/numad + ) + parted? ( + >=sys-block/parted-1.8[device-mapper] + sys-fs/lvm2[lvm] + ) + pcap? ( >=net-libs/libpcap-1.8.0 ) + policykit? ( + acct-group/libvirt + >=sys-auth/polkit-0.9 + ) + qemu? ( + >=app-emulation/qemu-4.2 + app-crypt/swtpm + >=dev-libs/yajl-2.0.3:= + ) + rbd? ( sys-cluster/ceph ) + sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) + selinux? ( >=sys-libs/libselinux-2.0.85 ) + virt-network? ( + net-dns/dnsmasq[dhcp,ipv6(+),script] + net-firewall/ebtables + >=net-firewall/iptables-1.4.10[ipv6(+)] + net-misc/radvd + sys-apps/iproute2[-minimal] + ) + virtiofsd? ( app-emulation/virtiofsd ) + wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) + xen? ( + >=app-emulation/xen-4.9.0 + app-emulation/xen-tools:= + ) + udev? ( + virtual/libudev:= + >=x11-libs/libpciaccess-0.10.9 + ) + zfs? ( sys-fs/zfs ) + kernel_linux? ( sys-apps/util-linux )" +DEPEND=" + ${BDEPEND} + ${RDEPEND} + ${PYTHON_DEPS} +" +# The 'circular' dependency on dev-python/libvirt-python is because of +# virt-qemu-qmp-proxy. +PDEPEND=" + qemu? ( dev-python/libvirt-python ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch + "${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch + "${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch + "${FILESDIR}"/${PN}-10.1.0-Fix-off-by-one-error-in-udevListInterfacesByStatus.patch + "${FILESDIR}"/${PN}-10.2.0-remote-check-for-negative-array-lengths-before-alloc.patch +) + +pkg_setup() { + # Check kernel configuration: + CONFIG_CHECK="" + use fuse && CONFIG_CHECK+=" + ~FUSE_FS" + + use lvm && CONFIG_CHECK+=" + ~BLK_DEV_DM + ~DM_MULTIPATH + ~DM_SNAPSHOT" + + use lxc && CONFIG_CHECK+=" + ~BLK_CGROUP + ~CGROUP_CPUACCT + ~CGROUP_DEVICE + ~CGROUP_FREEZER + ~CGROUP_NET_PRIO + ~CGROUP_PERF + ~CGROUPS + ~CGROUP_SCHED + ~CPUSETS + ~IPC_NS + ~MACVLAN + ~NAMESPACES + ~NET_CLS_CGROUP + ~NET_NS + ~PID_NS + ~POSIX_MQUEUE + ~SECURITYFS + ~USER_NS + ~UTS_NS + ~VETH + ~!GRKERNSEC_CHROOT_MOUNT + ~!GRKERNSEC_CHROOT_DOUBLE + ~!GRKERNSEC_CHROOT_PIVOT + ~!GRKERNSEC_CHROOT_CHMOD + ~!GRKERNSEC_CHROOT_CAPS" + + kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES" + + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_MARK_T + ~BRIDGE_NF_EBTABLES + ~NETFILTER_ADVANCED + ~NETFILTER_XT_CONNMARK + ~NETFILTER_XT_MARK + ~NETFILTER_XT_TARGET_CHECKSUM + ~IP_NF_FILTER + ~IP_NF_MANGLE + ~IP_NF_NAT + ~IP6_NF_FILTER + ~IP6_NF_MANGLE + ~IP6_NF_NAT" + + # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 + if use virt-network ; then + if kernel_is -lt 5 2 ; then + CONFIG_CHECK+=" + ~IP_NF_TARGET_MASQUERADE" + else + CONFIG_CHECK+=" + ~NETFILTER_XT_TARGET_MASQUERADE" + fi + fi + + # Bandwidth Limiting Support + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_T_NAT + ~IP_NF_TARGET_REJECT + ~NET_ACT_POLICE + ~NET_CLS_FW + ~NET_CLS_U32 + ~NET_SCH_HTB + ~NET_SCH_INGRESS + ~NET_SCH_SFQ" + + ERROR_USER_NS="Optional depending on LXC configuration." + + if [[ -n ${CONFIG_CHECK} ]]; then + linux-info_pkg_setup + fi + + python-any-r1_pkg_setup +} + +src_prepare() { + touch "${S}/.mailmap" || die + + default + python_fix_shebang . + + # Skip fragile tests which relies on pristine environment + # (Breaks because of sandbox environment variables) + # bug #802876 + sed -i -e "/commandtest/d" tests/meson.build || die + + # Tweak the init script: + cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die + sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ + -i "${S}/libvirtd.init" || die "sed failed" +} + +src_configure() { + local emesonargs=( + $(meson_feature apparmor) + $(meson_feature apparmor apparmor_profiles) + $(meson_feature audit) + $(meson_feature caps capng) + $(meson_feature dtrace) + $(meson_feature firewalld) + $(meson_feature fuse) + $(meson_feature glusterfs) + $(meson_feature glusterfs storage_gluster) + $(meson_feature iscsi storage_iscsi) + $(meson_feature iscsi-direct storage_iscsi_direct) + $(meson_feature libvirtd driver_libvirtd) + $(meson_feature libssh) + $(meson_feature libssh2) + $(meson_feature lvm storage_lvm) + $(meson_feature lvm storage_mpath) + $(meson_feature lxc driver_lxc) + $(meson_feature nls) + $(meson_feature numa numactl) + $(meson_feature numa numad) + $(meson_feature openvz driver_openvz) + $(meson_feature parted storage_disk) + $(meson_feature pcap libpcap) + $(meson_feature policykit polkit) + $(meson_feature qemu driver_qemu) + $(meson_feature qemu yajl) + $(meson_feature rbd storage_rbd) + $(meson_feature sasl) + $(meson_feature selinux) + $(meson_feature test tests) + $(meson_feature udev) + $(meson_feature virt-network driver_network) + $(meson_feature virtualbox driver_vbox) + $(meson_feature wireshark-plugins wireshark_dissector) + $(meson_feature xen driver_libxl) + $(meson_feature zfs storage_zfs) + + -Dnetcf=disabled + -Dsanlock=disabled + -Dopenwsman=disabled + + -Ddriver_esx=enabled + -Dinit_script=systemd + -Dqemu_user=$(usex caps qemu root) + -Dqemu_group=$(usex caps qemu root) + -Ddriver_remote=enabled + -Dstorage_fs=enabled + -Ddriver_vmware=enabled + + --localstatedir="${EPREFIX}/var" + -Dinitconfdir="${EPREFIX}/etc/systemd" + -Drunstatedir="${EPREFIX}/run" + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + ) + + meson_src_configure +} + +src_test() { + export VIR_TEST_DEBUG=1 + # Don't run the syntax check tests, they're fragile and not relevant + # to us downstream anyway. + # We also crank up the timeout (as Fedora does) just to preempt failures + # on slower arches. + meson_src_test --no-suite syntax-check --timeout-multiplier 10 +} + +src_install() { + meson_src_install + + # Depending on configuration option, libvirt will create some bogus + # directoreis. They are either not used, or libvirtd is able to create + # them on demand, so let's remove them. + # + # Note, we are using -f here so that rm does not fail or warn if the + # directory is nonexistent. + rm -rf "${D}"/etc/sysconfig + rm -rf "${D}"/var + rm -rf "${D}"/run + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf + + newinitd "${S}/libvirtd.init" libvirtd + newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests + newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd + newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd + + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests + + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +pkg_postinst() { + if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then + touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die + fi + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + tmpfiles_process libvirtd.conf + readme.gentoo_print_elog +} diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 38baa163aaa0..f1c08714d713 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -10,7 +10,7 @@ EAPI=8 # app-emulation/libvirt # Please bump them together! -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig diff --git a/app-emulation/virt-firmware/Manifest b/app-emulation/virt-firmware/Manifest index 22076120b622..8181799f3918 100644 --- a/app-emulation/virt-firmware/Manifest +++ b/app-emulation/virt-firmware/Manifest @@ -1,3 +1 @@ -DIST virt-firmware-24.2.tar.gz 110844 BLAKE2B db7ad7663678a313bdd0e23de7e374547e5dbc1a04b37a65e366ae042410a3a6c21ccfef3747a2534cb76906868caaf1364ac1ecd1443c1c1053a5b7687da50b SHA512 8583420acb31fb32e4c195c0c1816b36248ec2e486ded0795e51180e2690b2bcdc10eb8707f4fc9fa36da5b24082737c5c3b2e3988f6c5455e08a5d2a0ff92e7 -DIST virt-firmware-24.2_p20240325.tar.gz 107037 BLAKE2B d7fe7c760b769124ccc4192e3133563cf287b8a0cbe281fb758b66ae27a4c9461b6a5bdd7b97ec3e1c8e2a051b8a05fa45ded19eeb3bbbd5ff787443fed96a0d SHA512 4ea5d21bc57bda5fbfae79d70aa7805e1d4ca53aa5aeb40b555d5c03ff0fbd9780a92b3aaf9bc5b7cb8169205487309bff7031ded409e26d8d39b1fe3d937510 -DIST virt-firmware-24.2_p20240402.tar.gz 106875 BLAKE2B cdc6bde95a7db347e896c3d33e7ad0715c5a6cbb9a80dbcfb87379bb0f7693c0b96544cb3a1394ce115cfe98321d79339b682f02250930b85ff4bef35d038251 SHA512 50899655fe76e7ed71d3a607030a2067ae97f15f0d3698a54ec388ac6e27e2c2f39b2b4cb5552dad17e184124d62f70d045bc8b5b1f6c5931d477a911be11637 +DIST virt-firmware-24.4.tar.gz 111964 BLAKE2B 16005a6f911abf227988abaedd45237d44d403f367abd3c2d413f899a6c3e7db2a62edcd36b7408263f101a0f0a20bbea83bf51f7f798077311b478dfc6c9fc1 SHA512 3b13df25177fe5c20e460e2d82453e23ae96cb657f1228ff1c061db4c4197eba719a4d7f51a90fec60a4de2da9a0e9d3f056d53011bd4f61df7f40b706911a1d diff --git a/app-emulation/virt-firmware/files/virt-firmware-24.2-dont-force-shim.patch b/app-emulation/virt-firmware/files/virt-firmware-24.2-dont-force-shim.patch deleted file mode 100644 index bb45026391eb..000000000000 --- a/app-emulation/virt-firmware/files/virt-firmware-24.2-dont-force-shim.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://gitlab.com/kraxel/virt-firmware/-/merge_requests/11 -diff --git a/virt/firmware/bootcfg/linuxcfg.py b/virt/firmware/bootcfg/linuxcfg.py -index 5682b15..121af73 100644 ---- a/virt/firmware/bootcfg/linuxcfg.py -+++ b/virt/firmware/bootcfg/linuxcfg.py -@@ -188,9 +188,10 @@ class LinuxOsInfo(OsRelease): - - def shim_path(self): - esp = self.esp_path() -- subdir = self.esp_distro_dir() -+ distro_dir = self.esp_distro_dir() - arch = self.efi_arch() -- shim = f'{esp}/EFI/{subdir}/shim{arch}.efi' -- if os.path.exists(shim): -- return shim -+ for subdir in distro_dir, 'shim', 'Linux': -+ shim = f'{esp}/EFI/{subdir}/shim{arch}.efi' -+ if os.path.exists(shim): -+ return shim - return None -diff --git a/virt/firmware/bootcfg/main.py b/virt/firmware/bootcfg/main.py -index 04888d5..291903b 100644 ---- a/virt/firmware/bootcfg/main.py -+++ b/virt/firmware/bootcfg/main.py -@@ -34,8 +34,7 @@ def update_next_or_order(cfg, options, nr): - - def add_uki(cfg, options): - if not options.shim and cfg.secureboot: -- logging.error('shim binary not specified') -- sys.exit(1) -+ logging.warning('shim binary not specified') - if not options.title: - logging.error('entry title not specified') - sys.exit(1) -@@ -112,8 +111,8 @@ def boot_success(cfg, options): - - def update_boot_csv(cfg, options): - if not options.shim: -- logging.error('shim binary not specified') -- sys.exit(1) -+ logging.warning('shim binary not specified') -+ sys.exit(0) - efishim = linuxcfg.LinuxEfiFile(options.shim) - shimpath = efishim.dev_path_file() - diff --git a/app-emulation/virt-firmware/files/virt-firmware-24.2_p20240402-expand-shim-search.patch b/app-emulation/virt-firmware/files/virt-firmware-24.2_p20240402-expand-shim-search.patch deleted file mode 100644 index 9af50fb4b310..000000000000 --- a/app-emulation/virt-firmware/files/virt-firmware-24.2_p20240402-expand-shim-search.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://gitlab.com/kraxel/virt-firmware/-/merge_requests/11 -diff --git a/virt/firmware/bootcfg/linuxcfg.py b/virt/firmware/bootcfg/linuxcfg.py -index 5682b15..121af73 100644 ---- a/virt/firmware/bootcfg/linuxcfg.py -+++ b/virt/firmware/bootcfg/linuxcfg.py -@@ -188,9 +188,10 @@ class LinuxOsInfo(OsRelease): - - def shim_path(self): - esp = self.esp_path() -- subdir = self.esp_distro_dir() -+ distro_dir = self.esp_distro_dir() - arch = self.efi_arch() -- shim = f'{esp}/EFI/{subdir}/shim{arch}.efi' -- if os.path.exists(shim): -- return shim -+ for subdir in distro_dir, 'shim', 'Linux': -+ shim = f'{esp}/EFI/{subdir}/shim{arch}.efi' -+ if os.path.exists(shim): -+ return shim - return None diff --git a/app-emulation/virt-firmware/virt-firmware-24.2-r1.ebuild b/app-emulation/virt-firmware/virt-firmware-24.2-r1.ebuild deleted file mode 100644 index 60c7279c9636..000000000000 --- a/app-emulation/virt-firmware/virt-firmware-24.2-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2024 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 optfeature pypi systemd - -DESCRIPTION="Tools for ovmf/armvirt firmware volumes" -HOMEPAGE=" - https://gitlab.com/kraxel/virt-firmware - https://pypi.org/project/virt-firmware/ -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/pefile[${PYTHON_USEDEP}] -" - -distutils_enable_tests unittest - -python_test() { - eunittest tests -} - -python_install_all() { - distutils-r1_python_install_all - - doman man/*.1 - - doinitd "${FILESDIR}/kernel-bootcfg-boot-successful" - systemd_dounit systemd/kernel-bootcfg-boot-successful.service - - exeinto /usr/lib/kernel/install.d - doexe systemd/99-uki-uefi-setup.install -} - -pkg_postinst() { - optfeature "managing UEFI entries on Unified Kernel Image installation and removal" \ - "sys-boot/shim sys-kernel/installkernel[systemd,uki]" -} diff --git a/app-emulation/virt-firmware/virt-firmware-24.2_p20240325.ebuild b/app-emulation/virt-firmware/virt-firmware-24.2_p20240325.ebuild deleted file mode 100644 index 03838f0933b4..000000000000 --- a/app-emulation/virt-firmware/virt-firmware-24.2_p20240325.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 systemd optfeature - -COMMIT="58080ddb4868ca5bab571f518bb8fcc605b51cf5" - -DESCRIPTION="Tools for ovmf/armvirt firmware volumes" -HOMEPAGE=" - https://gitlab.com/kraxel/virt-firmware - https://pypi.org/project/virt-firmware/ -" -SRC_URI="https://gitlab.com/kraxel/virt-firmware/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${COMMIT}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -RDEPEND=" - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/pefile[${PYTHON_USEDEP}] - || ( - sys-apps/systemd[boot(-)] - sys-apps/systemd-utils[boot(-)] - ) -" # We need bootctl from systemd(-utils) - -PATCHES=( - "${FILESDIR}/${PN}-24.2-dont-force-shim.patch" -) - -distutils_enable_tests unittest - -python_test() { - eunittest tests -} - -python_install_all() { - distutils-r1_python_install_all - - doman man/*.1 - - doinitd "${FILESDIR}/kernel-bootcfg-boot-successful" - systemd_dounit systemd/kernel-bootcfg-boot-successful.service - - # Use our own provided by sys-kernel/installkernel[efistub] instead - #exeinto /usr/lib/kernel/install.d - #doexe systemd/99-uki-uefi-setup.install -} - -pkg_postinst() { - optfeature "automatically updating UEFI configuration on each kernel installation or removal" \ - "sys-kernel/installkernel[systemd,efistub]" -} diff --git a/app-emulation/virt-firmware/virt-firmware-24.2_p20240402.ebuild b/app-emulation/virt-firmware/virt-firmware-24.2_p20240402.ebuild deleted file mode 100644 index aa8ad953dd10..000000000000 --- a/app-emulation/virt-firmware/virt-firmware-24.2_p20240402.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 systemd optfeature - -COMMIT="07a1e03c356766eda0188d033bad38b8d27d55ef" - -DESCRIPTION="Tools for ovmf/armvirt firmware volumes" -HOMEPAGE=" - https://gitlab.com/kraxel/virt-firmware - https://pypi.org/project/virt-firmware/ -" -SRC_URI="https://gitlab.com/kraxel/virt-firmware/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${COMMIT}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -RDEPEND=" - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/pefile[${PYTHON_USEDEP}] - || ( - sys-apps/systemd[boot(-)] - sys-apps/systemd-utils[boot(-)] - ) -" # We need bootctl from systemd(-utils) - -PATCHES=( - "${FILESDIR}/${PN}-24.2_p20240402-expand-shim-search.patch" -) - -distutils_enable_tests unittest - -python_test() { - eunittest tests -} - -python_install_all() { - distutils-r1_python_install_all - - doman man/*.1 - - doinitd "${FILESDIR}/kernel-bootcfg-boot-successful" - systemd_dounit systemd/kernel-bootcfg-boot-successful.service - - # Use our own provided by sys-kernel/installkernel[efistub] instead - #exeinto /usr/lib/kernel/install.d - #doexe systemd/99-uki-uefi-setup.install -} - -pkg_postinst() { - optfeature "automatically updating UEFI configuration on each kernel installation or removal" \ - "sys-kernel/installkernel[systemd,efistub]" -} diff --git a/app-emulation/virt-firmware/virt-firmware-24.4.ebuild b/app-emulation/virt-firmware/virt-firmware-24.4.ebuild new file mode 100644 index 000000000000..36b536044e18 --- /dev/null +++ b/app-emulation/virt-firmware/virt-firmware-24.4.ebuild @@ -0,0 +1,52 @@ +# Copyright 2024 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 optfeature pypi systemd + +DESCRIPTION="Tools for ovmf/armvirt firmware volumes" +HOMEPAGE=" + https://gitlab.com/kraxel/virt-firmware + https://pypi.org/project/virt-firmware/ +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +# Currently requires files in /boot and read/write to efivars +RESTRICT="test" + +RDEPEND=" + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/pefile[${PYTHON_USEDEP}] +" + +distutils_enable_tests unittest + +python_test() { + eunittest tests +} + +python_install_all() { + distutils-r1_python_install_all + + doman man/*.1 + + doinitd "${FILESDIR}/kernel-bootcfg-boot-successful" + systemd_dounit systemd/kernel-bootcfg-boot-successful.service + + # Use our own provided by sys-kernel/installkernel[efistub,systemd] + #exeinto /usr/lib/kernel/install.d + #doexe systemd/99-uki-uefi-setup.install +} + +pkg_postinst() { + optfeature "automatically updating UEFI configuration on each kernel installation or removal" \ + "sys-kernel/installkernel[systemd,efistub]" +} diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.50-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.50-r1.ebuild new file mode 100644 index 000000000000..60c236597e5a --- /dev/null +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.50-r1.ebuild @@ -0,0 +1,292 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo linux-mod-r1 readme.gentoo-r1 systemd toolchain-funcs udev + +MY_PN="VirtualBox" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests" +HOMEPAGE="https://www.virtualbox.org/" +SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2 + https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~x86" +IUSE="X +dbus" + +# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist +RDEPEND=" + acct-group/vboxguest + acct-group/vboxsf + acct-user/vboxguest + sys-libs/pam + sys-libs/zlib + dbus? ( sys-apps/dbus ) + X? ( + x11-apps/xrandr + x11-apps/xrefresh + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXt + ) +" +DEPEND=" + ${RDEPEND} + X? ( + x11-base/xorg-proto + x11-libs/libICE + x11-libs/libSM + x11-libs/libXau + x11-libs/libXdmcp + ) +" +BDEPEND=" + >=dev-build/kbuild-0.1.9998.3127 + <=dev-build/kbuild-0.1.9998.3500 + >=dev-lang/yasm-0.6.2 + sys-devel/bin86 + sys-power/iasl +" + +PATCHES=( + "${FILESDIR}"/virtualbox-guest-additions-7.0.8-fix-gcc13.patch +) + +DOCS=() # Don't install the default README file during einstalldocs + +VBOX_MOD_SRC_DIR="out/linux.${ARCH}/release/bin/additions/src" +CONFIG_CHECK="~DRM_TTM ~DRM_VMWGFX" +WARNING_DRM_TTM="DRM_TTM is needed for running the vboxvideo driver." +WARNING_DRM_VMWGFX="DRM_VMWGFX is the recommended driver for VMSVGA." + +DOC_CONTENTS="\n +Please add users to the \"vboxguest\" group so they can\n +benefit from seamless mode, auto-resize and clipboard.\n +\n +The vboxsf group has been added to make automount services work.\n +These services are part of the shared folders support.\n +\n +Please add:\n + /etc/init.d/virtualbox-guest-additions\n +to the default runlevel in order to start\n +needed services.\n +\n +An autostart .desktop file has been installed to start\n +VBoxClient in desktop sessions.\n +\n +You can mount shared folders with:\n + mount -t vboxsf \n +\n +Warning:\n + this ebuild is only needed if you are running gentoo\n + inside a VirtualBox Virtual Machine, you don't need\n + it to run VirtualBox itself.\n +\n" + +src_prepare() { + eapply "${PATCHES[@]}" + + # Remove shipped binaries (kBuild,yasm), see bug #232775 + rm -r kBuild/bin tools || die + + # Provide kernel sources + pushd src/VBox/Additions &>/dev/null || die + ebegin "Extracting guest kernel module sources" + kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null + eend $? || die + popd &>/dev/null || die + + # PaX fixes (see bug #298988) + eapply -d "${VBOX_MOD_SRC_DIR}" -- "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch + + # Disable things unused or splitted into separate ebuilds + cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die + if ! use X; then + echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk || die + fi + + # Remove pointless GCC version check + sed -e '/^check_gcc$/d' -i configure || die + + # Respect LDFLAGS (bug #759100) + sed -i -e '/TEMPLATE_VBOXR3EXE_LDFLAGS.linux[ ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk || die + + eapply "${WORKDIR}/virtualbox-patches-6.1.36/patches" + eapply_user +} + +src_configure() { + tc-export AR CC CXX LD RANLIB + + # Build the user-space tools, warnings are harmless + local myconf=( + --with-gcc="$(tc-getCC)" + --with-g++="$(tc-getCXX)" + + --nofatal + --disable-xpcom + --disable-sdl-ttf + --disable-pulse + --disable-alsa + $(usev !dbus --disable-dbus) + --target-arch=${ARCH} + --with-linux="${KV_OUT_DIR}" + --build-headless + ) + + # bug #843437 + # Respect LDFLAGS (bug #759100) + # Cannot use LDFLAGS here because they also get passed to $(LD) + cat >> LocalConfig.kmk <<-EOF || die + CFLAGS=${CFLAGS} + CXXFLAGS=${CXXFLAGS} + CCLDFLAGS=${LDFLAGS} + EOF + + edo ./configure "${myconf[@]}" +} + +src_compile() { + source ./env.sh || die + + # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529) + MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) + MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) + MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" + + local myemakeargs=( + VBOX_BUILD_PUBLISHER=_Gentoo + VBOX_ONLY_ADDITIONS=1 + + KBUILD_VERBOSE=2 + + AS="$(tc-getCC)" + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + LD="$(tc-getCC)" + + TOOL_GCC3_CC="$(tc-getCC)" + TOOL_GCC3_CXX="$(tc-getCXX)" + TOOL_GCC3_LD="$(tc-getCC)" + TOOL_GCC3_AS="$(tc-getCC)" + TOOL_GCC3_AR="$(tc-getAR)" + TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)" + #TOOL_GCC3_LD_SYSMOD="$(tc-getCC)" + + TOOL_GXX3_CC="$(tc-getCC)" + TOOL_GXX3_CXX="$(tc-getCXX)" + TOOL_GXX3_LD="$(tc-getCXX)" + TOOL_GXX3_AS="$(tc-getCXX)" + TOOL_GXX3_AR="$(tc-getAR)" + TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)" + #TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)" + + TOOL_GCC3_CFLAGS="${CFLAGS}" + TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" + VBOX_GCC_OPT="${CXXFLAGS}" + VBOX_NM="$(tc-getNM)" + TOOL_YASM_AS=yasm + ) + + MAKE="kmk" emake "${myemakeargs[@]}" + + # Now creating the kernel modules. We must do this _after_ + # we compiled the user-space tools as we need two of the + # automatically generated header files. (>=3.2.0) + # Move this here for bug 836037 + local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" ) + local modlist=( vboxguest vboxsf ) + use X && modlist+=( vboxvideo ) + modlist=( "${modlist[@]/%/=misc:${VBOX_MOD_SRC_DIR}}" ) + linux-mod-r1_src_compile +} + +src_install() { + linux-mod-r1_src_install + + insinto /etc/modprobe.d # 485996 + newins - vboxsf.conf <<-EOF + # modprobe.d configuration file for VBOXSF + + # Internal Aliases - Do not edit + # ------------------------------ + alias fs-vboxsf vboxsf + EOF + + cd out/linux.${ARCH}/release/bin/additions || die + + insinto /sbin + newins mount.vboxsf mount.vboxsf + fperms 4755 /sbin/mount.vboxsf + + if use dbus; then + newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN} + else + newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN} + fi + + insinto /usr/sbin/ + newins VBoxService vboxguest-service + fperms 0755 /usr/sbin/vboxguest-service + + insinto /usr/bin + doins VBoxControl + fperms 0755 /usr/bin/VBoxControl + + # VBoxClient user service and xrandr wrapper + if use X ; then + doins VBoxClient + fperms 0755 /usr/bin/VBoxClient + doins VBoxDRMClient + fperms 4755 /usr/bin/VBoxDRMClient + + pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die + newins 98vboxadd-xclient VBoxClient-all + fperms 0755 /usr/bin/VBoxClient-all + popd &>/dev/null || die + fi + + # udev rule for vboxdrv + local udev_rules_dir="/lib/udev/rules.d" + dodir ${udev_rules_dir} + echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ + >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ + || die + echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ + >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ + || die + + # VBoxClient autostart file + insinto /etc/xdg/autostart + doins "${FILESDIR}"/vboxclient.desktop + + # sample xorg.conf + dodoc "${FILESDIR}"/xorg.conf.vbox + docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox + + systemd_dounit "${FILESDIR}/${PN}.service" + + readme.gentoo_create_doc +} + +pkg_postinst() { + linux-mod-r1_pkg_postinst + udev_reload + + if ! use X ; then + elog "The use flag \"X\" is off, enable it to install the" + elog "X Window System drivers and integration." + fi + + readme.gentoo_print_elog +} + +pkg_postrm() { + udev_reload +} diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.14-r3.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.14-r3.ebuild new file mode 100644 index 000000000000..92c9fb95c5c6 --- /dev/null +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.14-r3.ebuild @@ -0,0 +1,297 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo linux-mod-r1 readme.gentoo-r1 systemd toolchain-funcs udev + +MY_PN="VirtualBox" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests" +HOMEPAGE="https://www.virtualbox.org/" +SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2 + https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.14.tar.bz2" +S="${WORKDIR}/${MY_PN}-${PV}" + +# Reminder: see the LICENSE related comment in app-emulation/virtualbox-additions ebuild +LICENSE="GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~x86" +IUSE="+dbus gui" + +# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist +# TODO: find out what this is, remove comment if obsolete + +RDEPEND=" + acct-group/vboxguest + acct-group/vboxsf + acct-user/vboxguest + sys-libs/pam + sys-libs/zlib + dbus? ( sys-apps/dbus ) + gui? ( + x11-apps/xrandr + x11-apps/xrefresh + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXt + ) +" +# some libs here are indirect dependencies, and also needed at compile time. +# keeping them in DEPEND to avoid warnings from qa-vdb. +DEPEND=" + ${RDEPEND} + gui? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXau + x11-libs/libXdmcp + x11-base/xorg-proto + ) +" +BDEPEND=" + >=dev-lang/yasm-0.6.2 + >=dev-build/kbuild-0.1.9998.3127 + sys-devel/bin86 + sys-power/iasl +" + +PATCHES=( + "${FILESDIR}"/${PN}-7.0.8-fix-gcc13.patch + "${FILESDIR}"/${PN}-7.0.14-kernel-6.8.patch +) + +DOCS=() # Don't install the default README file during einstalldocs + +VBOX_MOD_SRC_DIR="out/linux.${ARCH}/release/bin/additions/src" +CONFIG_CHECK="~DRM_TTM ~DRM_VMWGFX" +WARNING_DRM_TTM="DRM_TTM is needed for running the vboxvideo driver." +WARNING_DRM_VMWGFX="DRM_VMWGFX is the recommended driver for VMSVGA." + +DOC_CONTENTS="\n +Please add users to the \"vboxguest\" group so they can\n +benefit from seamless mode, auto-resize and clipboard.\n +\n +The vboxsf group has been added to make automount services work.\n +These services are part of the shared folders support.\n +\n +Please add:\n + /etc/init.d/virtualbox-guest-additions\n +to the default runlevel in order to start\n +needed services.\n +\n +An autostart .desktop file has been installed to start\n +VBoxClient in desktop sessions.\n +\n +You can mount shared folders with:\n + mount -t vboxsf \n +\n +Warning:\n + this ebuild is only needed if you are running gentoo\n + inside a VirtualBox Virtual Machine, you don't need\n + it to run VirtualBox itself.\n +\n" + +src_prepare() { + eapply "${PATCHES[@]}" + + # Remove shipped binaries (kBuild,yasm), see bug #232775 + rm -r kBuild/bin tools || die + + # Provide kernel sources + pushd src/VBox/Additions &>/dev/null || die + ebegin "Extracting guest kernel module sources" + kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null + eend $? || die + popd &>/dev/null || die + + # PaX fixes (see bug #298988) + eapply -d "${VBOX_MOD_SRC_DIR}" -- "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch + + # Disable things unused or splitted into separate ebuilds + cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die + if ! use gui; then + echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk || die + fi + + # Remove pointless GCC version check + sed -e '/ check_gcc$/d' -i configure || die + + # Respect LDFLAGS (bug #759100) + sed -i -e '/TEMPLATE_VBoxR3Exe_LDFLAGS.linux[ ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk || die + + eapply "${WORKDIR}/virtualbox-patches-7.0.14/patches" + eapply_user +} + +src_configure() { + tc-export AR CC CXX LD RANLIB + + # Build the user-space tools, warnings are harmless + local myconf=( + --with-gcc="$(tc-getCC)" + --with-g++="$(tc-getCXX)" + + --nofatal + --disable-xpcom + --disable-sdl-ttf + --disable-pulse + --disable-alsa + $(usev !dbus --disable-dbus) + --target-arch=${ARCH} + --with-linux="${KV_OUT_DIR}" + --build-headless + ) + + # bug #843437 + # Respect LDFLAGS (bug #759100) + # Cannot use LDFLAGS here because they also get passed to $(LD) + cat >> LocalConfig.kmk <<-EOF || die + CFLAGS=${CFLAGS} + CXXFLAGS=${CXXFLAGS} + CCLDFLAGS=${LDFLAGS} + EOF + + edo ./configure "${myconf[@]}" +} + +src_compile() { + source ./env.sh || die + + # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529) + MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) + MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) + MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" + + local myemakeargs=( + VBOX_BUILD_PUBLISHER=_Gentoo + VBOX_ONLY_ADDITIONS=1 + + KBUILD_VERBOSE=2 + + AS="$(tc-getCC)" + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + LD="$(tc-getCC)" + + TOOL_GCC3_CC="$(tc-getCC)" + TOOL_GCC3_CXX="$(tc-getCXX)" + TOOL_GCC3_LD="$(tc-getCC)" + TOOL_GCC3_AS="$(tc-getCC)" + TOOL_GCC3_AR="$(tc-getAR)" + TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)" + #TOOL_GCC3_LD_SYSMOD="$(tc-getCC)" + + TOOL_GXX3_CC="$(tc-getCC)" + TOOL_GXX3_CXX="$(tc-getCXX)" + TOOL_GXX3_LD="$(tc-getCXX)" + TOOL_GXX3_AS="$(tc-getCXX)" + TOOL_GXX3_AR="$(tc-getAR)" + TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)" + #TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)" + + TOOL_GCC3_CFLAGS="${CFLAGS}" + TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" + VBOX_GCC_OPT="${CXXFLAGS}" + VBOX_NM="$(tc-getNM)" + TOOL_YASM_AS=yasm + ) + + MAKE="kmk" emake "${myemakeargs[@]}" + + # Now creating the kernel modules. We must do this _after_ + # we compiled the user-space tools as we need two of the + # automatically generated header files. (>=3.2.0) + # Move this here for bug 836037 + local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" ) + local modlist=( vboxguest vboxsf ) + use gui && modlist+=( vboxvideo ) + modlist=( "${modlist[@]/%/=misc:${VBOX_MOD_SRC_DIR}}" ) + linux-mod-r1_src_compile +} + +src_install() { + linux-mod-r1_src_install + + insinto /etc/modprobe.d # 485996 + newins - vboxsf.conf <<-EOF + # modprobe.d configuration file for VBOXSF + + # Internal Aliases - Do not edit + # ------------------------------ + alias fs-vboxsf vboxsf + EOF + + cd out/linux.${ARCH}/release/bin/additions || die + + insinto /sbin + newins mount.vboxsf mount.vboxsf + fperms 4755 /sbin/mount.vboxsf + + if use dbus; then + newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN} + else + newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN} + fi + + insinto /usr/sbin/ + newins VBoxService vboxguest-service + fperms 0755 /usr/sbin/vboxguest-service + + insinto /usr/bin + doins VBoxControl + fperms 0755 /usr/bin/VBoxControl + + # VBoxClient user service and xrandr wrapper + if use gui ; then + doins VBoxClient + fperms 0755 /usr/bin/VBoxClient + doins VBoxDRMClient + fperms 4755 /usr/bin/VBoxDRMClient + + pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die + newins 98vboxadd-xclient VBoxClient-all + fperms 0755 /usr/bin/VBoxClient-all + popd &>/dev/null || die + fi + + # udev rule for vboxdrv + local udev_rules_dir="/lib/udev/rules.d" + dodir ${udev_rules_dir} + echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ + >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ + || die + echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ + >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ + || die + + # VBoxClient autostart file + insinto /etc/xdg/autostart + doins "${FILESDIR}"/vboxclient.desktop + + # sample xorg.conf + dodoc "${FILESDIR}"/xorg.conf.vbox + docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox + + systemd_dounit "${FILESDIR}/${PN}.service" + + readme.gentoo_create_doc +} + +pkg_postinst() { + linux-mod-r1_pkg_postinst + udev_reload + + if ! use gui ; then + elog "The use flag \"gui\" is off, enable it to install the" + elog "X Window System drivers and integration." + fi + + readme.gentoo_print_elog +} + +pkg_postrm() { + udev_reload +} diff --git a/app-emulation/xen-tools/xen-tools-4.17.4.ebuild b/app-emulation/xen-tools/xen-tools-4.17.4.ebuild index c62a890bde7f..c4bcc325110c 100644 --- a/app-emulation/xen-tools/xen-tools-4.17.4.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.17.4.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://xenbits.xen.org/git-http/${REPO}" S="${WORKDIR}/${REPO}" else - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" SEABIOS_VER="1.16.0" EDK2_COMMIT="b16284e2a0011489f6e16dfcc6af7623c3cbaf0b" diff --git a/app-emulation/xen/xen-4.17.4.ebuild b/app-emulation/xen/xen-4.17.4.ebuild index 3152a4b60f44..7b2ca8a62fef 100644 --- a/app-emulation/xen/xen-4.17.4.ebuild +++ b/app-emulation/xen/xen-4.17.4.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://xenbits.xen.org/git-http/xen.git" SRC_URI="" else - KEYWORDS="~amd64 ~arm -x86" + KEYWORDS="amd64 ~arm -x86" XEN_GENTOO_PATCHSET_NUM=2 XEN_GENTOO_PATCHSET_BASE=4.17.0 diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz index 8b08ef71b5b5..8b38f9c8cbe3 100644 Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest index 85296383f781..1977efc7c393 100644 --- a/app-i18n/ibus-m17n/Manifest +++ b/app-i18n/ibus-m17n/Manifest @@ -1 +1,2 @@ DIST ibus-m17n-1.4.28.tar.gz 646718 BLAKE2B 6e424d7d10e7758e7b0bfc7c679447366b564bc9fe97bf9cbab66d177f8a33ec93e35007d8ff18d473dbc74793ceff5fb4b448445f450fec38175f1e5bfe7238 SHA512 b96dea6a46f50529aeb0b828f8846b1e856e0fc0bb3dbf14ea384283156741653ff396e1647a835c505292cfea78f788ec0a391a57622b8f4c3e13fb35f191fc +DIST ibus-m17n-1.4.29.tar.gz 648370 BLAKE2B c3c65439167bbca9bbef8734f4f95282c3c8476a51654325b517bd22350ae98e5194bcf20cd3311d14e4938f66d98a40419145e7d5ffb6d33398ddbde4212702 SHA512 bb3b3f44fa5a79e7e15c71b30760f7b29454a47b167f12cc4bde52ee03151f794795fd0d9bb6a2a7877a0afc909f81342d50461da3d49a905255c76288023edb diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.29.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.29.ebuild new file mode 100644 index 000000000000..d17cb13bd689 --- /dev/null +++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.29.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit gnome2-utils xdg + +DESCRIPTION="M17N engine for IBus" +HOMEPAGE="https://github.com/ibus/ibus/wiki" +SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gtk nls" + +DEPEND="app-i18n/ibus + dev-libs/m17n-lib + gtk? ( x11-libs/gtk+:3 ) + nls? ( virtual/libintl )" +RDEPEND="${DEPEND} + >=dev-db/m17n-db-1.7" +BDEPEND="sys-devel/gettext + virtual/pkgconfig" + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_with gtk gtk 3.0) +} + +pkg_preinst() { + xdg_pkg_preinst + gnome2_schemas_savelist +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest index 283155a05f39..d6420ad723f9 100644 --- a/app-i18n/ibus-typing-booster/Manifest +++ b/app-i18n/ibus-typing-booster/Manifest @@ -1,2 +1,3 @@ DIST ibus-typing-booster-2.25.3.tar.gz 12388617 BLAKE2B 44cbaa162ac76fb36f37117ebf0aa49b390dde89214ecac423e55a1a16b41df30ffd02039534e9873d54616ca68cca363c238429beb08cab1cc2955748a0b96c SHA512 df1ff9cd939c7fb72c616b239a5526060ab6840bae2c01c9e6ce338ac28cea0d4f525632f138e226b12ff6389574996fc523fe1722917db9f73d395927db9a4c DIST ibus-typing-booster-2.25.4.tar.gz 12388721 BLAKE2B 3cce75d2524d2b1467d3feb7a0b2067309b88a6b070238f7e7524e426d9556e7624b15c3ff775280abb332ab899ef81fcdc0764e6a61e519947139a5aefc66b4 SHA512 f84111db28d84aa9888b2085ef1351e86c330479c65cf4ff64d87d36001093125c864460a3cb9084ecb430561556f2cf339ee0965a5025c8177a54fec67f4982 +DIST ibus-typing-booster-2.25.6.tar.gz 12390887 BLAKE2B 5c0813e16829073e1066117fdf03c2fb713854572e5905f71cb98d51b1f172c8fbd7054fa38c08db7c1e82e1c779258b2934d95508db4914d9e15ade25f61b64 SHA512 212acfc9dcb9d9f3f4405dcfd5e35cf0fec48e41d74539a2a7f9a2b8eb2a1fa6b62919c12b7bbedb9f5ae4904fe463aee2c9801d59eec1389706489e485c54f9 diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.6.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.6.ebuild new file mode 100644 index 000000000000..95f8e650235b --- /dev/null +++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.6.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_REQ_USE="sqlite(+)" + +inherit gnome2-utils python-single-r1 xdg + +DESCRIPTION="Completion input method for IBus" +HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster" +SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +RESTRICT="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + dev-libs/m17n-lib + $(python_gen_cond_dep ' + app-i18n/ibus[python(+),${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pyenchant[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + ')" +RDEPEND="${DEPEND} + >=dev-db/m17n-db-1.7" +BDEPEND="sys-devel/gettext + virtual/pkgconfig" + +src_prepare() { + default + + sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in +} + +pkg_preinst() { + xdg_pkg_preinst + gnome2_schemas_savelist +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-i18n/kanjipad/kanjipad-2.0.0-r1.ebuild b/app-i18n/kanjipad/kanjipad-2.0.0-r1.ebuild new file mode 100644 index 000000000000..2f20eacc9b1c --- /dev/null +++ b/app-i18n/kanjipad/kanjipad-2.0.0-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Japanese handwriting recognition tool" +HOMEPAGE="https://fishsoup.net/software/kanjipad/" +SRC_URI="https://fishsoup.net/software/kanjipad/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" + +RDEPEND=" + app-accessibility/at-spi2-core:2 + x11-libs/gtk+:2 + dev-libs/glib:2 + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz:= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/pango +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-cflags.patch" + "${FILESDIR}/${P}-underlinking.patch" +) + +src_prepare() { + default + sed -i -e "s|PREFIX=/usr/local|PREFIX=/usr|" \ + -e "s|-DG.*DISABLE_DEPRECATED||g" Makefile || die "Fixing Makefile failed" +} + +src_configure() { + tc-export CC +} + +src_install() { + dobin kanjipad kpengine + insinto /usr/share/kanjipad + doins jdata.dat + + local DOCS=( ChangeLog README TODO jstroke/README-kanjipad ) + einstalldocs +} diff --git a/app-i18n/man-pages-ja/man-pages-ja-20180315-r1.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20180315-r1.ebuild deleted file mode 100644 index a61c9490411a..000000000000 --- a/app-i18n/man-pages-ja/man-pages-ja-20180315-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -GENTOO_MAN_P="portage-${PN}-20060415" - -DESCRIPTION="A collection of manual pages translated into Japanese" -HOMEPAGE="http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja" -SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz - https://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz" - -LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="" - -RDEPEND="virtual/man" - -src_prepare() { - - sed -i -e "/^\(man\|shadow\)/s:Y:N:" script/pkgs.list || die - - # remove man pages that are provided by other packages. - # - sys-apps/shadow +nls - rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1 || die - rm -f manual/*/man5/passwd.5 || die - rm -f manual/*/man8/{vigr,vipw}.8 || die - # - app-arch/rpm +nls - rm -rf manual/rpm || die - - for f in manual/*/man8/ld{,-linux}.so.8 ; do - mv ${f} ${f/.so.8/.so.ja.8} || die - done - mv "${WORKDIR}"/${GENTOO_MAN_P}/portage/g-cpan.pl{,.ja}.1 || die - - eapply_user -} - -src_compile() { - : -} - -src_install() { - - local x y z pkg - - for x in $(tac script/pkgs.list | grep -v '^[#].*'); do - if [[ -z "$pkg" ]]; then - pkg=$x - continue - fi - - if [[ "$x" == "N" ]]; then - pkg= - continue - fi - - einfo "install $pkg" - - for y in $(ls -d manual/$pkg/man* 2>/dev/null); do - doman -i18n=ja $y/* - done - - pkg= - done - - dodoc README - - cd "${WORKDIR}"/${GENTOO_MAN_P} - - for x in *; do - if [ -d "$x" ]; then - einfo "install $x" - - for z in $(for y in $x/*.[1-9]; do echo ${y##*.}; done | sort | uniq); do - doman -i18n=ja $x/*.$z - done - fi - done - - newdoc ChangeLog ChangeLog.GentooJP - -} - -pkg_postinst() { - - echo - elog "JM (Japanese Manual) project has used utf8 encoding" - elog "since 2012/04." - elog "You need to set appropriate LANG variables to use" - elog "Japanese manpages." - elog "e.g." - elog "\tLANG=\"ja_JP.utf8\"" - elog "\texport LANG" - echo - -} diff --git a/app-i18n/man-pages-ja/man-pages-ja-20180315-r2.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20180315-r2.ebuild new file mode 100644 index 000000000000..ba2f16849e9e --- /dev/null +++ b/app-i18n/man-pages-ja/man-pages-ja-20180315-r2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GENTOO_MAN_P="portage-${PN}-20060415" + +DESCRIPTION="Collection of manual pages translated into Japanese" +HOMEPAGE="http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja" +SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz + https://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz" + +LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + +RDEPEND="virtual/man" + +src_prepare() { + sed -i -e "/^\(man\|shadow\)/s:Y:N:" script/pkgs.list || die + + # remove man pages that are provided by other packages. + # - sys-apps/shadow +nls + rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1 || die + rm -f manual/*/man5/passwd.5 || die + rm -f manual/*/man8/{vigr,vipw}.8 || die + # - app-arch/rpm +nls + rm -rf manual/rpm || die + + for f in manual/*/man8/ld{,-linux}.so.8 ; do + mv ${f} ${f/.so.8/.so.ja.8} || die + done + mv "${WORKDIR}"/${GENTOO_MAN_P}/portage/g-cpan.pl{,.ja}.1 || die + + eapply_user +} + +src_compile() { + : +} + +src_install() { + local x y z pkg + for x in $(tac script/pkgs.list | grep -v '^[#].*'); do + if [[ -z ${pkg} ]]; then + pkg=${x} + continue + fi + + if [[ ${x} == "N" ]]; then + pkg= + continue + fi + + einfo "install ${pkg}" + for y in $(ls -d manual/${pkg}/man* 2>/dev/null); do + doman -i18n=ja ${y}/* + done + + pkg= + done + + dodoc README + + cd "${WORKDIR}"/${GENTOO_MAN_P} + + for x in *; do + if [[ -d ${x} ]]; then + einfo "install ${x}" + + for z in $(for y in ${x}/*.[1-9]; do echo ${y##*.}; done | sort -u); do + doman -i18n=ja ${x}/*.${z} + done + fi + done + + newdoc ChangeLog ChangeLog.GentooJP +} + +pkg_postinst() { + echo + elog "JM (Japanese Manual) project has used utf8 encoding" + elog "since 2012/04." + elog "You need to set appropriate LANG variables to use" + elog "Japanese manpages." + elog "e.g." + elog "\tLANG=\"ja_JP.utf8\"" + elog "\texport LANG" + echo +} diff --git a/app-i18n/man-pages-ja/metadata.xml b/app-i18n/man-pages-ja/metadata.xml index 0083f2482458..f65126ea5b95 100644 --- a/app-i18n/man-pages-ja/metadata.xml +++ b/app-i18n/man-pages-ja/metadata.xml @@ -15,5 +15,6 @@ linuxjm + hattya/portage-man-pages-ja diff --git a/app-i18n/nkf/nkf-2.1.5-r1.ebuild b/app-i18n/nkf/nkf-2.1.5-r1.ebuild index 44490ab3b00b..5c009ec1ef8a 100644 --- a/app-i18n/nkf/nkf-2.1.5-r1.ebuild +++ b/app-i18n/nkf/nkf-2.1.5-r1.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=8 +EAPI="8" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_PEP517="setuptools" DISTUTILS_OPTIONAL="1" +DISTUTILS_EXT="1" inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot @@ -26,7 +28,7 @@ RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND}" BDEPEND="python? ( ${PYTHON_DEPS} - dev-python/setuptools[${PYTHON_USEDEP}] + ${DISTUTILS_DEPS} )" src_unpack() { @@ -40,9 +42,11 @@ src_prepare() { Makefile if use python; then mv "${WORKDIR}"/${PY_P} NKF.python || die + sed -i "s/-/_/g" NKF.python/setup.cfg + eapply "${FILESDIR}"/${PN}-python.patch eapply "${FILESDIR}"/${P}-python-ssize_t.patch - eapply "${FILESDIR}"/${PN}-2.1.5-python-ssize_t-deux.patch + eapply "${FILESDIR}"/${P}-python-ssize_t-deux.patch cd NKF.python || die distutils-r1_src_prepare diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild deleted file mode 100644 index a437dd676a61..000000000000 --- a/app-i18n/nkf/nkf-2.1.5.ebuild +++ /dev/null @@ -1,112 +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_OPTIONAL="1" - -inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot - -PY_P="python-${PN}-0.2.0_p20191121" -PY_COMMIT="c2c6724714b66f295137c8818dae4c09fc09e0a3" - -DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support" -HOMEPAGE="https://osdn.net/projects/nkf/" -SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz - python? ( https://github.com/fumiyas/python-${PN}/archive/${PY_COMMIT}.tar.gz -> ${PY_P}.tar.gz )" - -LICENSE="ZLIB python? ( BSD )" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="perl python l10n_ja" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND}" -BDEPEND="python? ( - ${PYTHON_DEPS} - dev-python/setuptools[${PYTHON_USEDEP}] - )" - -src_unpack() { - use python && vcs-snapshot_src_unpack || default -} - -src_prepare() { - sed -i \ - -e "/^CFLAGS/{ s/-g -O2//; s/=/+=/; }" \ - -e "/ -o ${PN}/s/\(-o \)/\$(LDFLAGS) \1/" \ - Makefile - if use python; then - mv "${WORKDIR}"/${PY_P} NKF.python || die - eapply "${FILESDIR}"/${PN}-python.patch - cd NKF.python || die - distutils-r1_src_prepare - cd - >/dev/null || die - fi - - default -} - -src_configure() { - default - if use perl; then - cd NKF.mod || die - perl-module_src_configure - cd - >/dev/null || die - fi - if use python; then - cd NKF.python || die - distutils-r1_src_configure - cd - >/dev/null || die - fi -} - -src_compile() { - emake CC="$(tc-getCC)" - if use perl; then - cd NKF.mod || die - perl-module_src_compile - cd - >/dev/null || die - fi - if use python; then - cd NKF.python || die - distutils-r1_src_compile - cd - >/dev/null || die - fi -} - -src_test() { - default - if use perl; then - cd NKF.mod || die - perl-module_src_test - cd - >/dev/null || die - fi -} - -src_install() { - dobin ${PN} - doman ${PN}.1 - - if use l10n_ja; then - iconv -f ISO-2022-JP-3 -t UTF-8 ${PN}.1j > ${PN}.ja.1 || die - doman ${PN}.ja.1 - fi - dodoc ${PN}.doc - - if use perl; then - cd NKF.mod || die - docinto perl - perl-module_src_install - cd - >/dev/null || die - fi - if use python; then - cd NKF.python || die - docinto python - DOCS= distutils-r1_src_install - dodoc CHANGES README.md - cd - >/dev/null || die - fi -} diff --git a/app-i18n/scim-m17n/scim-m17n-0.2.3-r1.ebuild b/app-i18n/scim-m17n/scim-m17n-0.2.3-r1.ebuild index 36ac1b4d7704..195a5f8adafa 100644 --- a/app-i18n/scim-m17n/scim-m17n-0.2.3-r1.ebuild +++ b/app-i18n/scim-m17n/scim-m17n-0.2.3-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="" RDEPEND=" diff --git a/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild b/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild deleted file mode 100644 index 4f823e5eb9e6..000000000000 --- a/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="An input module for Smart Common Input Method (SCIM) which uses m17n as backend" -HOMEPAGE="http://www.scim-im.org/projects/imengines" -SRC_URI="mirror://sourceforge/scim/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -RDEPEND=">=app-i18n/scim-1.4 - >=dev-libs/m17n-lib-1.2.0" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - default - # update the 2009 era configure / libtool scripts, which fail with LTO - eautoreconf -} - -src_configure() { - econf --disable-static -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - elog - elog "To use SCIM with both GTK2 and XIM, you should use the following" - elog "in your user startup scripts such as .gnomerc or .xinitrc:" - elog - elog "LANG='your_language' scim -d" - elog "export XMODIFIERS=@im=SCIM" - elog "export GTK_IM_MODULE=\"scim\"" - elog -} diff --git a/app-i18n/scim-uim/scim-uim-0.2.0-r3.ebuild b/app-i18n/scim-uim/scim-uim-0.2.0-r3.ebuild index 2e7b59282ff8..3672fe4dfdf1 100644 --- a/app-i18n/scim-uim/scim-uim-0.2.0-r3.ebuild +++ b/app-i18n/scim-uim/scim-uim-0.2.0-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc ~x86" IUSE="" RDEPEND=" diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz index b310eb142a80..0c0679a56c04 100644 Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ diff --git a/app-metrics/postfix_exporter/Manifest b/app-metrics/postfix_exporter/Manifest index 0d848ba69037..f5249a3782a1 100644 --- a/app-metrics/postfix_exporter/Manifest +++ b/app-metrics/postfix_exporter/Manifest @@ -8,3 +8,5 @@ DIST github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c DIST github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz 63007 BLAKE2B a62f727ef9dd42d52f495ab7449cbafbe7c7fcdb1bc171df97c40348dcb7fe12788223d7a2aea3398cae7dd17ec73ae6349b5e5f35f4785f2796cc9a16c2d420 SHA512 4f1ab6cffc309a00ed68959b9372e1d3ea4f8d597b8c462a4e365cf22737245e601b8bda0764bbd1f0172d773805d16e90a8aa90cb95e9462e35320043e04060 DIST github.com-prometheus-procfs-780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz 56873 BLAKE2B 31ae12d51b6a28c285bd5854b137d2634499d0db3c2c65c0404ca5a902ffec2e9bf689261ea51c2fe1643733f09a780c437f7a7899a5e6c3e3d100a36e07b897 SHA512 a548c6bc71456c9878cb34ad1514d92c8737e01b555e953f848cc1ae7944424b06a14a8ab0c6de4d99dbb189a0f29e2bb9ae09b5adffc327c28f5c50c2819892 DIST postfix_exporter-0.1.2.tar.gz 11552 BLAKE2B 987c81482fc984e8f6c870fdaf7ce2ef67b3fa66e5782713a645d35b76a1bde1dde97a79705569d1423a9356309d0b7240c77dba386127e8a5035990220d2a62 SHA512 579793281dedd858538ab9a931e0003cfc9989204ebf4352dd4860e5a7f62b919d77a9e0facb9daff6706771010f9e807061dace8cb88928635d55111c7c482a +DIST postfix_exporter-0.3.0-deps.tar.xz 10261848 BLAKE2B 3ab985ae873f53019b093266df90d4593b3a1755bafb6a0df600ae84411fd73f578cfeb6749fdfade5392ec55ec4df1916cf6b86f0ea0b5e04828dda50687789 SHA512 d591ef808fd3ccc7b48f37257ae6925b8ae491decef9ac679f13af08d0c6717b162a53cc2cd2ffb98361f38eaceaac24b2fba1db958fc9fa172fbe5060b639b1 +DIST postfix_exporter-0.3.0.tar.gz 26528 BLAKE2B 9d1b17917f4a6a6e73e1477e973454d9ce774d218463f151117e8772f77ea17c00536d0262789644716992c3c6ddcbf8b26d9c92eea77f9750e971e3a7c0d1d4 SHA512 1812d2ad95803290c12615975ba6e44c0a6f73dd0e10db927a9f1c58bfce27b71c9c2928f58623e263ba2737d2780f220e6a7fe0992e2607f290478eaa080b39 diff --git a/app-metrics/postfix_exporter/postfix_exporter-0.3.0.ebuild b/app-metrics/postfix_exporter/postfix_exporter-0.3.0.ebuild new file mode 100644 index 000000000000..ec665dd32649 --- /dev/null +++ b/app-metrics/postfix_exporter/postfix_exporter-0.3.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Prometheus Exporter for Postfix" +HOMEPAGE="https://github.com/kumina/postfix_exporter" +SRC_URI=" + https://github.com/kumina/postfix_exporter/archive/${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~arthurzam/distfiles/app-metrics/${PN}/${P}-deps.tar.xz +" + +LICENSE="Apache-2.0 BSD MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="systemd" +RESTRICT+=" test" + +RDEPEND=" + acct-group/postfix_exporter + acct-user/postfix_exporter +" +DEPEND="${RDEPEND} + systemd? ( sys-apps/systemd ) +" + +src_compile() { + ego build -tags "$(usex systemd '' 'nosystemd')" -v -o bin/${PN} +} + +src_install() { + dobin bin/${PN} + dodoc {CHANGELOG,README}.md + keepdir /var/log/${PN} + fowners ${PN}:${PN} /var/log/${PN} + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotated" "${PN}" +} diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index 50e32ef84d11..222db47cc56e 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/golly/golly-4.2-r1.ebuild b/app-misc/golly/golly-4.2-r1.ebuild new file mode 100644 index 000000000000..c7e51fab9793 --- /dev/null +++ b/app-misc/golly/golly-4.2-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER=3.2-gtk3 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg + +DESCRIPTION="simulator for Conway's Game of Life and other cellular automata" +HOMEPAGE="http://golly.sourceforge.net/ + https://sourceforge.net/projects/golly/" +SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" +S="${WORKDIR}/${P}-src" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + sys-libs/zlib + virtual/opengl + x11-libs/wxGTK:${WX_GTK_VER}[X,curl,opengl,sdl,tiff] + ${PYTHON_DEPS} +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-4.0-CFLAGS.patch ) + +pkg_setup() { + python-single-r1_pkg_setup + setup-wxwidgets +} + +src_compile() { + local -a mymakeopts=( + ENABLE_SOUND=yes + GOLLYDIR="${EPREFIX}/usr/share/${PN}" + PYTHON=${EPYTHON} + WX_CONFIG=${WX_CONFIG} + AR="$(tc-getAR)" + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + CXXC="$(tc-getCXX)" + RANLIB="$(tc-getRANLIB)" + ) + emake -C gui-wx -f makefile-gtk "${mymakeopts[@]}" +} + +src_install() { + # Has no 'make install', let's install files manually. + exeinto /usr/bin + doexe golly bgolly + + insinto /usr/share/${PN} + doins -r Help Patterns Scripts Rules docs + + newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm + make_desktop_entry ${PN} "Golly" ${PN} "Science" +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/app-misc/golly/golly-4.2.ebuild b/app-misc/golly/golly-4.2.ebuild deleted file mode 100644 index a35f1c8f3a23..000000000000 --- a/app-misc/golly/golly-4.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WX_GTK_VER=3.2-gtk3 -PYTHON_COMPAT=( python3_{9..11} ) - -inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg - -DESCRIPTION="simulator for Conway's Game of Life and other cellular automata" -HOMEPAGE="http://golly.sourceforge.net/ - https://sourceforge.net/projects/golly/" -SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" -S="${WORKDIR}/${P}-src" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - sys-libs/zlib - virtual/opengl - x11-libs/wxGTK:${WX_GTK_VER}[X,curl,opengl,sdl,tiff] - ${PYTHON_DEPS} -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-4.0-CFLAGS.patch ) - -pkg_setup() { - python-single-r1_pkg_setup - setup-wxwidgets -} - -src_compile() { - local -a mymakeopts=( - ENABLE_SOUND=yes - GOLLYDIR="${EPREFIX}/usr/share/${PN}" - PYTHON=${EPYTHON} - WX_CONFIG=${WX_CONFIG} - AR="$(tc-getAR)" - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - CXXC="$(tc-getCXX)" - RANLIB="$(tc-getRANLIB)" - ) - emake -C gui-wx -f makefile-gtk "${mymakeopts[@]}" -} - -src_install() { - # Has no 'make install', let's install files manually. - exeinto /usr/bin - doexe golly bgolly - - insinto /usr/share/${PN} - doins -r Help Patterns Scripts Rules docs - - newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm - make_desktop_entry ${PN} "Golly" ${PN} "Science" -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/app-misc/icdiff/icdiff-2.0.7-r1.ebuild b/app-misc/icdiff/icdiff-2.0.7-r1.ebuild new file mode 100644 index 000000000000..8b8fd9dff54e --- /dev/null +++ b/app-misc/icdiff/icdiff-2.0.7-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} pypy3 ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 + +DESCRIPTION="Colourized diff that supports side-by-side diffing" +HOMEPAGE="https://www.jefftk.com/icdiff" +SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-release-${PV}" + +LICENSE="PSF-2" +SLOT="0" +KEYWORDS="~amd64" + +PATCHES=( + "${FILESDIR}/icdiff-1.9.5-tests.patch" + "${FILESDIR}/icdiff-2.0.7-tests.patch" +) + +DOCS=( README.md ChangeLog ) + +python_test() { + bash test.sh "${EPYTHON%.*}" || die "Tests failed with ${EPYTHON}" +} diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest index 40dd6f42a796..4a045ee193d3 100644 --- a/app-misc/pax-utils/Manifest +++ b/app-misc/pax-utils/Manifest @@ -1,2 +1 @@ -DIST pax-utils-1.3.5.tar.xz 119764 BLAKE2B 13bd4dbdadefb382133bf42a2b1e740e84ac11661595b082346c80ff05fc7423f5d75cc01ff8a651d921310ae66c2b39a862d0b9db5d7f18e11d393360627fcf SHA512 f2b1753e15907461cc395abffe033d7f7ab8eb15e296b874e2c9d00507458672347b32d7f2f05d3a8625fc3afbdbf0721543f84e062afce7181a726d967e4836 DIST pax-utils-1.3.7.tar.xz 113740 BLAKE2B d801df9c426f318c871655f238fe27b53e656c2789ef8508019997c98bbc540987b611642d87e76ae9f76a95f6cce1acd0b10e3491a146d1e3b3f727a6f96bdc SHA512 f1b87a564573da838a02c4cc10e0d5f9754c3b004ecb172a6290b48a8179b30695ae556942457dfac3caf07b91dd56eb1d801475c35e9708e4d671aa507f9576 diff --git a/app-misc/pax-utils/pax-utils-1.3.5.ebuild b/app-misc/pax-utils/pax-utils-1.3.5.ebuild deleted file mode 100644 index 61d80fca9097..000000000000 --- a/app-misc/pax-utils/pax-utils-1.3.5.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Note: if bumping pax-utils because of syscall changes in glibc, please -# revbump glibc and update the dependency in its ebuild for the affected -# versions. -PYTHON_COMPAT=( python3_{10..11} ) - -inherit meson python-single-r1 - -DESCRIPTION="ELF utils that can check files for security relevant properties" -HOMEPAGE="https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pax-utils.git" - inherit git-r3 -else - SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz - https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" - 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" -IUSE="caps +man python seccomp test" - -_PYTHON_DEPS=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pyelftools[${PYTHON_USEDEP}] - ') -" - -RDEPEND="caps? ( >=sys-libs/libcap-2.24 ) - python? ( ${_PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - caps? ( virtual/pkgconfig ) - man? ( app-text/xmlto ) - - python? ( ${_PYTHON_DEPS} ) -" -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( python ) -" -RESTRICT=" - !test? ( test ) -" - -PATCHES=( - "${FILESDIR}/pax-utils-1.3.5-man-reorder-xmlto-arguments.patch" -) - -pkg_setup() { - if use test || use python; then - python-single-r1_pkg_setup - fi -} - -src_configure() { - local emesonargs=( - "-Dlddtree_implementation=$(usex python python sh)" - $(meson_feature caps use_libcap) - $(meson_feature man build_manpages) - $(meson_use seccomp use_seccomp) - $(meson_use test tests) - - # fuzzing is currently broken - -Duse_fuzzing=false - ) - meson_src_configure -} - -src_install() { - meson_src_install - - use python && python_fix_shebang "${ED}"/usr/bin/lddtree -} diff --git a/app-misc/pax-utils/pax-utils-1.3.7.ebuild b/app-misc/pax-utils/pax-utils-1.3.7.ebuild index 533f1b106d01..5b93dc47b744 100644 --- a/app-misc/pax-utils/pax-utils-1.3.7.ebuild +++ b/app-misc/pax-utils/pax-utils-1.3.7.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Note: if bumping pax-utils because of syscall changes in glibc, please # revbump glibc and update the dependency in its ebuild for the affected # versions. -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson python-single-r1 diff --git a/app-misc/pax-utils/pax-utils-9999.ebuild b/app-misc/pax-utils/pax-utils-9999.ebuild index 26cbf8dbb922..191841deb477 100644 --- a/app-misc/pax-utils/pax-utils-9999.ebuild +++ b/app-misc/pax-utils/pax-utils-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 # Note: if bumping pax-utils because of syscall changes in glibc, please # revbump glibc and update the dependency in its ebuild for the affected # versions. -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson python-single-r1 diff --git a/app-misc/sl/sl-5.02-r1.ebuild b/app-misc/sl/sl-5.02-r1.ebuild index 50d9b2537716..b5c52723376d 100644 --- a/app-misc/sl/sl-5.02-r1.ebuild +++ b/app-misc/sl/sl-5.02-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mtoyoda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Toyoda" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="l10n_ja" RDEPEND="sys-libs/ncurses:=" diff --git a/app-misc/sl/sl-5.02.ebuild b/app-misc/sl/sl-5.02.ebuild deleted file mode 100644 index 5d88a10d5355..000000000000 --- a/app-misc/sl/sl-5.02.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="sophisticated graphical program which corrects your miss typing" -HOMEPAGE="http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html https://github.com/mtoyoda/sl/" -SRC_URI="https://github.com/mtoyoda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Toyoda" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="l10n_ja" - -RDEPEND="sys-libs/ncurses:0=" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( README.md ) - -src_prepare() { - default - sed \ - -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" \ - -i Makefile || die -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin "${PN}" - doman "${PN}.1" - - if use l10n_ja; then - newman "${PN}.1.ja" "${PN}.ja.1" - DOCS+=( README.ja.md ) - fi - - einstalldocs -} diff --git a/app-misc/tdl/Manifest b/app-misc/tdl/Manifest index 51017ec91023..ce65d5af2603 100644 --- a/app-misc/tdl/Manifest +++ b/app-misc/tdl/Manifest @@ -1,3 +1 @@ DIST tdl-1.5.2.gh.tar.gz 66542 BLAKE2B 7e7017ee3937d8775907e907a1eb4ab34880013c85cddbdfcc9239e35bf788904f232e668345074966b5940ab518af91df842cf38a50517dcfdf9953b403cf33 SHA512 c00abe14a0a4e2d0bec83e4f5cf3c28749976d42f5a15d0f4065f928fae20d7bfdf4339dc4d863ab4d4006d307a8797fc12e20cf1ef5b9a71c5018ec98d4f732 -DIST tdl-1.5.2.tar.gz 66057 BLAKE2B cc2d5581126d995098b5dc3032c97213614acaea3b984a507a824da2ba4d3be9afff954722f29acf0b9bd26db42ada22d67fc9110496961c2cb3104d9b4b7ece SHA512 8c07a5b6a5434bb567a2d68b6e0215bbfa7be3f7176ae1042652ac18684289117230af25d8d161fcf1ba27d9b740fd3fcd43c3213467b533de64390686481fe0 -DIST tdl-screenshot.png.tar 20480 BLAKE2B ce9284501ba1550179e1c3da54399a802aae3c0fb23b9a1ea25a1adb0f5c0404fe7694a360435913bb91cc1977d71561050ec0fe4e1681db775cdc7ec5fa11b7 SHA512 caca9793626b320ded4c7f16425b98e4bfde9ab0ca3c1bea60ecc8aaa8db080ab6fc3c474aef4d56e394b6415ec1162671329912aa22452dbd5dc72b50c7c8f6 diff --git a/app-misc/tdl/tdl-1.5.2-r3.ebuild b/app-misc/tdl/tdl-1.5.2-r3.ebuild deleted file mode 100644 index f4f63c471a56..000000000000 --- a/app-misc/tdl/tdl-1.5.2-r3.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Command line To Do List manager" -HOMEPAGE="http://www.rc0.org.uk/tdl/" -SRC_URI=" - http://www.rpcurnow.force9.co.uk/tdl/${P}.tar.gz - https://dev.gentoo.org/~jlec/distfiles/${PN}-screenshot.png.tar" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="doc readline" - -RDEPEND=" - sys-libs/ncurses:0= - sys-libs/readline:0=" - -DEPEND=" - ${RDEPEND} - sys-apps/texinfo - doc? ( virtual/texi2dvi )" - -PATCHES=( - "${FILESDIR}"/${PV}-ldflags.patch - "${FILESDIR}"/${P}-list.c.patch - "${FILESDIR}"/${P}-main.c.patch - "${FILESDIR}"/${P}-man.patch -) - -DOCS=( README NEWS tdl.txt "${WORKDIR}"/screenshot.png tdl.html ) - -src_prepare() { - default - tc-export CC -} - -src_configure() { - local myconf=( --prefix="${EPREFIX}"/usr ) - - if ! use readline; then - myconf+=( "${myconf} --without-readline" ) - sed -i 's#\($(LIB_READLINE)\)#\1 -lncurses##g' "${S}"/Makefile.in || die - fi - - sed -i 's#-ltermcap#-lncurses#g' "${S}"/configure || die - "${S}"/configure "${myconf[@]}" || die "configure failed" -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - emake all tdl.info tdl.html tdl.txt - - if use doc; then - emake tdl.dvi tdl.ps tdl.pdf - fi -} - -src_install() { - einstalldocs - doinfo tdl.info - - dobin tdl - doman tdl.1 - - local i - for i in tdl{a,l,d,g} - do - dosym tdl /usr/bin/${i} - dosym tdl.1 /usr/share/man/man1/${i}.1 - done - - if use doc; then - dodoc tdl.dvi tdl.ps tdl.pdf - fi -} diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz index d0ceeb51c815..40398f9c6036 100644 Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest index b26b7e9b6f24..bc36c290cb17 100644 --- a/app-office/gnumeric/Manifest +++ b/app-office/gnumeric/Manifest @@ -1,3 +1 @@ -DIST gnumeric-1.12.55.tar.xz 18157492 BLAKE2B 6c084f681e33f00af80cc11dbddf33166877ca30480ae6fc6b65a0ef06271c634e2ba24af55df4c6b306833e2611e959dcbd8b117c97bbf46598419ed4d124e4 SHA512 04127a353d5109e3a31d9a3bd42d6d177366cc6c5d900516b4c8a7a8fcaecc71bd4e2e94876719246841070964b393af97988cafbd6313cea135c1757889e878 -DIST gnumeric-1.12.56.tar.xz 18125644 BLAKE2B 0b43ed53dd544dda76ae1401d329f8b029f16117dafb4c2f939c1c48bf61d035e17692485df4034ce77a63031c5477aefd307a04d756c3017fed47354acb4f8a SHA512 badcba4cb08627628c216e4f2429c361d3d8ec7f653b6dda8a451356c798dc0cf323348c0272696a02bd47dd97b95bde0e7b23551cc0f63d8bf470dca219be0d DIST gnumeric-1.12.57.tar.xz 18149400 BLAKE2B d268cd2ac260e13be51bca53f4456b9db4d67376c34d15dd6483c1c697f6418120fc31630894fe037979a46277d557fd7b66f226d92d8ab414d87c9c5e27b53f SHA512 67886aff17338c41997cb71d2ee8fcac0f3b9dfc4ef1897b50866844e002ba7867f263daa3aadcaa10ba29746795fad0a4f852bdc22cdd4bc41293c952b69e9d diff --git a/app-office/gnumeric/gnumeric-1.12.55.ebuild b/app-office/gnumeric/gnumeric-1.12.55.ebuild deleted file mode 100644 index 478a458bef9a..000000000000 --- a/app-office/gnumeric/gnumeric-1.12.55.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) - -inherit autotools gnome.org python-r1 xdg - -DESCRIPTION="The GNOME Spreadsheet" -HOMEPAGE="http://www.gnumeric.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="+introspection libgda perl" -REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )" - -# Missing gnome-extra/libgnomedb required version in tree -# but its upstream is dead and will be dropped soon. - -# lots of missing files, also fails tests due to 80-bit long story -# upstream bug #721556 -RESTRICT="test" - -# Gnumeric has two python components -# 1. The python loader for loading python-based plugins. -# This component is pure python 2 and a port "is not currently being worked on". -# 2. The python gobject-based introspection API. This component is compatible -# with python 3. -# Component 1. can only be re-enabled once someone has ported the upstream -# codebase to python 3. -# https://gitlab.gnome.org/GNOME/gnumeric/issues/419#note_618852 -RDEPEND=" - app-arch/bzip2 - sys-libs/zlib - >=dev-libs/glib-2.40.0:2 - >=gnome-extra/libgsf-1.14.33:= - >=x11-libs/goffice-0.10.55:0.10[introspection?] - >=dev-libs/libxml2-2.4.12:2 - >=x11-libs/pango-1.24.0:= - - >=x11-libs/gtk+-3.8.7:3 - x11-libs/cairo:=[svg(+)] - - introspection? ( - ${PYTHON_DEPS} - >=dev-libs/gobject-introspection-1:= - ) - perl? ( dev-lang/perl:= ) - libgda? ( gnome-extra/libgda:5[gtk] )" -DEPEND="${RDEPEND}" -BDEPEND=" - app-text/docbook-xml-dtd:4.5 - app-text/yelp-tools - dev-build/gtk-doc-am - >=dev-util/intltool-0.35.0 - virtual/pkgconfig" - -src_prepare() { - default - - # Manage gi overrides ourselves - sed '/SUBDIRS/ s/introspection//' -i Makefile.{am,in} || die - - elibtoolize -} - -src_configure() { - econf \ - --disable-gtk-doc \ - --disable-maintainer-mode \ - --disable-schemas-compile \ - --disable-static \ - --without-psiconv \ - --without-python \ - --with-zlib \ - $(use_with libgda gda) \ - $(use_enable introspection) \ - $(use_with perl) -} - -src_install() { - default - dodoc HACKING MAINTAINERS - - if use introspection; then - python_moduleinto gi.overrides - python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py - fi - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/app-office/gnumeric/gnumeric-1.12.56.ebuild b/app-office/gnumeric/gnumeric-1.12.56.ebuild deleted file mode 100644 index 1fc5db16fdf5..000000000000 --- a/app-office/gnumeric/gnumeric-1.12.56.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) - -inherit autotools gnome.org python-r1 xdg - -DESCRIPTION="The GNOME Spreadsheet" -HOMEPAGE="http://www.gnumeric.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="+introspection libgda perl" -REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )" - -# Missing gnome-extra/libgnomedb required version in tree -# but its upstream is dead and will be dropped soon. - -# lots of missing files, also fails tests due to 80-bit long story -# upstream bug #721556 -RESTRICT="test" - -# Gnumeric has two python components -# 1. The python loader for loading python-based plugins. -# This component is pure python 2 and a port "is not currently being worked on". -# 2. The python gobject-based introspection API. This component is compatible -# with python 3. -# Component 1. can only be re-enabled once someone has ported the upstream -# codebase to python 3. -# https://gitlab.gnome.org/GNOME/gnumeric/issues/419#note_618852 -RDEPEND=" - app-arch/bzip2 - sys-libs/zlib - >=dev-libs/glib-2.40.0:2 - >=gnome-extra/libgsf-1.14.33:= - >=x11-libs/goffice-0.10.55:0.10[introspection?] - >=dev-libs/libxml2-2.4.12:2 - >=x11-libs/pango-1.24.0:= - - >=x11-libs/gtk+-3.8.7:3 - x11-libs/cairo:=[svg(+)] - - introspection? ( - ${PYTHON_DEPS} - >=dev-libs/gobject-introspection-1:= - ) - perl? ( dev-lang/perl:= ) - libgda? ( gnome-extra/libgda:5[gtk] )" -DEPEND="${RDEPEND}" -BDEPEND=" - app-text/docbook-xml-dtd:4.5 - app-text/yelp-tools - dev-build/gtk-doc-am - >=dev-util/intltool-0.35.0 - virtual/pkgconfig" - -src_prepare() { - default - - # Manage gi overrides ourselves - sed '/SUBDIRS/ s/introspection//' -i Makefile.{am,in} || die - - elibtoolize -} - -src_configure() { - econf \ - --disable-gtk-doc \ - --disable-maintainer-mode \ - --disable-schemas-compile \ - --disable-static \ - --without-psiconv \ - --without-python \ - --with-zlib \ - $(use_with libgda gda) \ - $(use_enable introspection) \ - $(use_with perl) -} - -src_install() { - default - dodoc HACKING MAINTAINERS - - if use introspection; then - python_moduleinto gi.overrides - python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py - fi - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/app-office/joplin-desktop/Manifest b/app-office/joplin-desktop/Manifest index 821b992879c7..53d8db28a914 100644 --- a/app-office/joplin-desktop/Manifest +++ b/app-office/joplin-desktop/Manifest @@ -1,4 +1,3 @@ -DIST Joplin-2.14.11.AppImage 247754522 BLAKE2B c39b87ca790b41d30c505b1001b75b442790c314cfd1340e2a6c1df7fa9d83505a9664d9fa57f30f7d2dd4dd23e2e04abad3bced978023203e2d9de773aac1a6 SHA512 1f2ed8d9ca6c83d86e09eb039b7d200c926e6ccd02e3db0f1e276640204bf5d6cc2df511b302fcf8b28edcff8f3534b0d52d051439f4275ce1b8f6a55fa5ad78 DIST Joplin-2.14.17.AppImage 248140038 BLAKE2B 62fb124745ced06fce45cea01efb8eae39556cb58bec768935e826e070f6eaba0050daf8c42bb6308e74539735a9e955c188a0c00c5b6209a4550733776c6d38 SHA512 ff6db5b353092d87c35c9c39038f93b0b8f7da8f021fa3057dcdf15cbbffd72b81c5a180ec439802b58060b3862d46ed902ab66a315f574713b9d871b4788502 DIST Joplin-2.14.19.AppImage 248153086 BLAKE2B dfd05909610ff85af78bb7073d3a19b83ac4db4edf4f6cf181f681a347a0badade48214da52b0ad3b2239b87f2fcffb70ff84234f9bffae9bd04d41735c7573a SHA512 7be9cdce0b1a25fdc7c0e5757faa542f11906e572af477fdd17d57fc9f3683bfb99801c91e7f03ac6ee819b72206339a61bb0aac61c66a35013af097ee8bb3a8 DIST Joplin-2.14.20.AppImage 248141263 BLAKE2B 2a4afa5a5d0aabb84d75ac572339098da684c742614c1b97a7dca18d0d8ee018f7a81f9a3361b1aba4658cf5bbed055f96e76316b8fe19dab6aa111b7fbeffab SHA512 50ebaa06ad225387e2117a6453e92d5665f90bc5d7dec492aac0993781e6e7cdca8aaa2dff06d740146888e2dd04f623d72af060c41765825b52e3c2a9d03890 diff --git a/app-office/joplin-desktop/joplin-desktop-2.14.11.ebuild b/app-office/joplin-desktop/joplin-desktop-2.14.11.ebuild deleted file mode 100644 index 8178f87f501f..000000000000 --- a/app-office/joplin-desktop/joplin-desktop-2.14.11.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# NOTICE: This is a Electron app (oh my) and the upstream only provides AppImages. - -EAPI=8 - -APPIMAGE="Joplin-${PV}.AppImage" - -inherit desktop xdg - -DESCRIPTION="Secure note taking and to-do app with synchronization capabilities" -HOMEPAGE="https://joplinapp.org/ - https://github.com/laurent22/joplin/" -SRC_URI="https://github.com/laurent22/joplin/releases/download/v${PV}/${APPIMAGE}" - -LICENSE="AGPL-3+" -SLOT="0" -KEYWORDS="-* amd64" -RESTRICT="bindist" - -RDEPEND=" - >=app-accessibility/at-spi2-core-2.46.0:2 - app-crypt/libsecret[crypt] - app-misc/ca-certificates - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - media-libs/alsa-lib - media-libs/libcanberra[gtk3] - media-libs/libglvnd - media-libs/mesa - net-misc/curl - net-print/cups - sys-apps/dbus - sys-libs/zlib - sys-process/lsof - x11-libs/cairo - x11-libs/gtk+:3 - x11-libs/libdrm - x11-libs/libnotify - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libxkbcommon - x11-libs/libxkbfile - x11-libs/libXrandr - x11-libs/libXScrnSaver - x11-libs/pango - x11-misc/xdg-utils -" - -QA_PREBUILT="*" - -src_unpack() { - mkdir -p "${S}" || die - cp "${DISTDIR}/${APPIMAGE}" "${S}" || die - - cd "${S}" || die # "appimage-extract" unpacks to current directory. - chmod +x "${S}/${APPIMAGE}" || die - "${S}/${APPIMAGE}" --appimage-extract || die -} - -src_prepare() { - # Fix permissions. - find "${S}" -type d -exec chmod a+rx {} + || die - find "${S}" -type f -exec chmod a+r {} + || die - - default -} - -src_install() { - cd "${S}/squashfs-root" || die - - insinto /usr/share - doins -r ./usr/share/icons - - local apphome="/opt/${PN}" - local toremove=( - .DirIcon - @joplinapp-desktop.desktop - @joplinapp-desktop.png - AppRun - LICENSE.electron.txt - LICENSES.chromium.html - resources/app.asar.unpacked/node_modules/7zip-bin-linux/arm - resources/app.asar.unpacked/node_modules/7zip-bin-linux/arm64 - resources/app.asar.unpacked/node_modules/node-notifier - usr - ) - rm -f -r "${toremove[@]}" || die - - mkdir -p "${ED}/${apphome}" || die - cp -r . "${ED}/${apphome}" || die - - dosym -r "${apphome}/@joplinapp-desktop" "/usr/bin/${PN}" - make_desktop_entry "${PN}" Joplin @joplinapp-desktop "Office;" \ - "StartupWMClass=Joplin\nMimeType=x-scheme-handler/joplin;" -} diff --git a/app-office/joplin-desktop/joplin-desktop-2.14.19.ebuild b/app-office/joplin-desktop/joplin-desktop-2.14.19.ebuild index a9c365263d83..8178f87f501f 100644 --- a/app-office/joplin-desktop/joplin-desktop-2.14.19.ebuild +++ b/app-office/joplin-desktop/joplin-desktop-2.14.19.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/laurent22/joplin/releases/download/v${PV}/${APPIMAGE LICENSE="AGPL-3+" SLOT="0" -KEYWORDS="-* ~amd64" +KEYWORDS="-* amd64" RESTRICT="bindist" RDEPEND=" diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index d88204750c21..77fd055a4717 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -19,11 +19,11 @@ DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48d DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114 DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1 SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e -DIST libreoffice-24.2.2.2.tar.xz 280611816 BLAKE2B db0f141f93ae5d43b0c4ae363560770a98930ebe2fbbe8ab44909bc57d9d88bcb0d4476e374e1af1e4d6e38b4167d6d50a28719fecee69f61483f34522be57d2 SHA512 a05b8ea123b687dc27b9e9919814581efc155a075d797d1ddf2e2565dd029f82e09efe52b0c4082dde6156704023b6262c91ef356e6f4794250dfd133759cb29 +DIST libreoffice-24.2.3.1.tar.xz 280290188 BLAKE2B 92ca634b3000a6c63d9cfe53e84e3139bbf083246437d070bb7ef2e294c7b2c548526763e1bdffc2af7c222dc0a9cfdef4c1db291a6aa182c2cbca1be957a24b SHA512 76c7fd3d36a350224f834016889a7e93307ae0bb1b05e4c2dee0c2e90ff35604b5cf99363d3a49c9a2d35828045820b5fcac6d50392cc127c968d7febd3aa905 DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6 DIST libreoffice-7.6.6.3.tar.xz 282144120 BLAKE2B 8d6f39046c9793c8dc5e2667e684c32f61b475b83787c75eeacf441a636c7244b032ae2cd7dac75c3077de63c68382e63bb834f69986ef788d78542df087b19b SHA512 822584e1a191aac08f3141ba2dc2b91b0cbd50635a8506e9f3d00e224c997e1ec83957dd8a7dbede28a0ba28e1a8658d7e0b526bf796db286210393a326e6ca3 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f -DIST libreoffice-help-24.2.2.2.tar.xz 167069856 BLAKE2B 1d3524ea1db78420b0f5df54d58517bd7f1419dd125086bc1e36851250062f3ed5dd14793f1bee0017220c007b5e624b5e0baf8aa6c83ff0a18381c5ed6d547e SHA512 c05f87a24b511ad34ce7c8bb02e90034848a6297033e3d1f2ea14f2d8686ba5e01547031960f214c215e41e9aa105dd6c52ace29e4807dcca92fd4297230598c +DIST libreoffice-help-24.2.3.1.tar.xz 167013500 BLAKE2B 5d0a8ff77fa164626dc10eb99dad89f62df0077b397b88c8bfe720b2d68e650ed77597fc666d243c85079a27b882b9bc06f837a82776f0868ed1b877ed7cb590 SHA512 3c2e7402fc6e0f764d1105ea971a7f01593d1c21efe6452055ff7f7144ef637bdf7f145ca08739bac8ad59b1d3ba5b7877c52b2760d7b4463812326e11ab9a99 DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859 DIST libreoffice-help-7.6.6.3.tar.xz 166956596 BLAKE2B 217b32cf9d1882b2a60e436bb6319be5c60807bd7bb8ce373a6a2ecbd8d6f2537bd2a13d58ea14f47532a5a780df1815457adc473e2b0107e5e510db144d90a4 SHA512 07ed22d2161770a39e618075aadc5b42f8f5c436938a0aa29351628e61572e6e1d03642d45541dcfebf57dfdd1e558b23a8d596025fb45a1771652ad2860583f DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d diff --git a/app-office/libreoffice/libreoffice-24.2.2.2.ebuild b/app-office/libreoffice/libreoffice-24.2.3.1.ebuild similarity index 100% rename from app-office/libreoffice/libreoffice-24.2.2.2.ebuild rename to app-office/libreoffice/libreoffice-24.2.3.1.ebuild diff --git a/app-office/lyx/lyx-2.3.7.ebuild b/app-office/lyx/lyx-2.3.7.ebuild index 6b8f2be77d4d..29a7b60275a0 100644 --- a/app-office/lyx/lyx-2.3.7.ebuild +++ b/app-office/lyx/lyx-2.3.7.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://ftp.lyx.org/pub/lyx/stable/$(ver_cut 1-2).x/${MY_P}-1.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" +KEYWORDS="amd64 ~arm64 ~riscv ~x86 ~x64-macos" IUSE="aspell cups debug dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/app-office/lyx/lyx-2.4.0_rc4.ebuild b/app-office/lyx/lyx-2.4.0_rc4.ebuild index 77bf28a6298f..f40e3e2a9aec 100644 --- a/app-office/lyx/lyx-2.4.0_rc4.ebuild +++ b/app-office/lyx/lyx-2.4.0_rc4.ebuild @@ -15,8 +15,9 @@ S=${WORKDIR}/${P/_rc/~RC} LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~arm64" -IUSE="aspell cups debug dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he" +IUSE="aspell cups dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="test" RDEPEND="${PYTHON_DEPS} app-text/mythes @@ -118,17 +119,17 @@ src_configure() { # external dependencies -DLYX_EXTERNAL_Z=ON -DLYX_EXTERNAL_ICONV=ON - -DLYX_EXTERNAL_HUNSPELL=$(usex !debug) - -DLYX_EXTERNAL_MYTHES=$(usex !debug ON OFF) - -DLYX_EXTERNAL_BOOST=$(usex !debug) + -DLYX_EXTERNAL_HUNSPELL=ON + -DLYX_EXTERNAL_MYTHES=ON + -DLYX_EXTERNAL_BOOST=ON -DLYX_PROGRAM_SUFFIX=OFF # debug control -DLYX_NO_OPTIMIZE=OFF - -DLYX_RELEASE=$(usex !debug) - -DLYX_DEBUG=$(usex debug) - -DLYX_DEBUG_GLIBC=$(usex debug) - -DLYX_STDLIB_DEBUG=$(usex debug) + -DLYX_RELEASE=ON + -DLYX_DEBUG=OFF + -DLYX_DEBUG_GLIBC=OFF + -DLYX_STDLIB_DEBUG=OFF ) cmake_src_configure diff --git a/app-office/merkuro/Manifest b/app-office/merkuro/Manifest index f4ce38992332..f723b7694b01 100644 --- a/app-office/merkuro/Manifest +++ b/app-office/merkuro/Manifest @@ -1,2 +1,2 @@ DIST merkuro-23.08.5.tar.xz 981888 BLAKE2B 26c93d9663b11f2221c62bab467e11c5938b11c34c21074688e3ad654d9e0d203d0f01cb76d07c629a9193e1481bef873f0cee0b6643b903747369b5e71cc13a SHA512 d3ce8f149a890890548e87e06fe480798410efc137fb602e173fa96b15bcb568e58d5f7064cbdddcdc0eef309f847dae3e9f5f112bc96ce6bac4b9a98b0ea38e -DIST merkuro-24.02.1.tar.xz 741112 BLAKE2B cbe779eb0bda5506005e758e9c39b61aea60cf8695ba3d2a42f3440b7f32f43a87e40962fbffd4253657c8dacfa16eca920804ea5a01b2385e9d688e1eaa5333 SHA512 88bd035bdff6b85c83e943b2961993ba314c0d319311bcd25e979eff7e5953e234f867e3e07122ac18e775f6d230dd3b6d52ecd0fe039afe3d41b688eb806ef2 +DIST merkuro-24.02.2.tar.xz 742448 BLAKE2B 7009ad0f7bf28210b91a860bee2eb9ff15bf7babd00feab73b1c5aa084e7fd51f84016f88c292c20a8ea71a240ed922158a5d03b7a99f1c369edbb9a09c2da9c SHA512 4958ddd9e15637852da04004f661b120315e95c0430dd910e8018c74dda475785b0cf91afc8cfe24199dd134f9de1ce2a048d3531161ea444f1af1f5ed43b88e diff --git a/app-office/merkuro/merkuro-24.02.1.ebuild b/app-office/merkuro/merkuro-24.02.2.ebuild similarity index 100% rename from app-office/merkuro/merkuro-24.02.1.ebuild rename to app-office/merkuro/merkuro-24.02.2.ebuild diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz index 378d5d82ff04..a5212171612d 100644 Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ diff --git a/app-portage/elt-patches/elt-patches-20240213.ebuild b/app-portage/elt-patches/elt-patches-20240213.ebuild index e4f296996a88..1c8e8632cc83 100644 --- a/app-portage/elt-patches/elt-patches-20240213.ebuild +++ b/app-portage/elt-patches/elt-patches-20240213.ebuild @@ -19,7 +19,7 @@ else https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz " - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" diff --git a/app-portage/g-sorcery/Manifest b/app-portage/g-sorcery/Manifest deleted file mode 100644 index 448bb1fd225f..000000000000 --- a/app-portage/g-sorcery/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST g-sorcery-0.2.3.tar.gz 55672 BLAKE2B f94ec2f449f4b6ae71df4de88519e0a766e543200829cf3ee1535086194c8365a68abfb4156dfd1bbe27b212e1d5c90b5acc7d32b87818f6292e02715c0a59c7 SHA512 2090c93b27b66ab155b3f05ffcddc4790e5d2e68ec02b089fd21c2f56b562dfe4b3ba4820b8c37876be38b2774b466849b6f6b1b03674c3c9d0226ad0049b943 diff --git a/app-portage/g-sorcery/g-sorcery-0.2.3.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.3.ebuild deleted file mode 100644 index ca027e4b7293..000000000000 --- a/app-portage/g-sorcery/g-sorcery-0.2.3.ebuild +++ /dev/null @@ -1,45 +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,11} ) - -inherit distutils-r1 prefix - -DESCRIPTION="framework for ebuild generators" -HOMEPAGE="https://gitweb.gentoo.org/proj/g-sorcery.git" -SRC_URI="https://gitweb.gentoo.org/proj/g-sorcery.git/snapshot/${P}.tar.gz" - -LICENSE="GPL-2" # v2 only -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="bson git test" -RESTRICT="!test? ( test )" - -RDEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - git? ( dev-vcs/git ) - sys-apps/portage[${PYTHON_USEDEP}]" -BDEPEND="${RDEPEND}" -#PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]" - -src_prepare() { - hprefixify setup.py - default -} - -python_test() { - PYTHONPATH="." "${PYTHON}" scripts/run_tests.py || die -} - -python_install_all() { - distutils-r1_python_install_all - - doman docs/*.8 - - docinto html - dodoc docs/developer_instructions.html - - diropts -m0777 - keepdir /var/lib/g-sorcery -} diff --git a/app-portage/g-sorcery/metadata.xml b/app-portage/g-sorcery/metadata.xml deleted file mode 100644 index 5e9e06aba2b0..000000000000 --- a/app-portage/g-sorcery/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Support BSON file format for package DB - - - gnu-emacs@gentoo.org - Gentoo GNU Emacs project - - - proj/g-sorcery - gentoo/g-sorcery - - diff --git a/app-portage/gs-elpa/Manifest b/app-portage/gs-elpa/Manifest deleted file mode 100644 index 18065a4e1c62..000000000000 --- a/app-portage/gs-elpa/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gs-elpa-0.2.2.tar.gz 15807 BLAKE2B 39e2096e568566e8fc42fd1cbf2db98fd4f3e7ecfa4ab8e2e274c0ba2422b258f8064f4606d434df970b80074844a691a828ba7ea4547a500faa32cb84c0f93a SHA512 ffbaeaa8971bc47031f860f2a46bec1c61f2f5767ebea90126444622a57afa05d93015ce297d890cf96f8200653647d18d7f6df78079af35a58e7cef46a810b0 -DIST gs-elpa-0.2.3.tar.gz 15809 BLAKE2B 5048d65dfa8d155bd4b1bf98846fbe1c5cfac2e5be455b7b200a0102a453f0697202e6b6e4dda17fc54de81da68d94f88005d6c78a376019f314a5113be7ac90 SHA512 8fb31fc1696811e10eb8f99ef10926f38acbc48cb1bd67939e408dcefb628ebf8049446f161e3b192bbe55ce21f335916e286522dd72d8fc31ce0699c4dce3c9 diff --git a/app-portage/gs-elpa/gs-elpa-0.2.2-r2.ebuild b/app-portage/gs-elpa/gs-elpa-0.2.2-r2.ebuild deleted file mode 100644 index 1aadde98ff35..000000000000 --- a/app-portage/gs-elpa/gs-elpa-0.2.2-r2.ebuild +++ /dev/null @@ -1,25 +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,11} ) - -inherit distutils-r1 - -DESCRIPTION="g-sorcery backend for elisp packages" -HOMEPAGE="https://gitweb.gentoo.org/proj/gs-elpa.git" -SRC_URI="https://gitweb.gentoo.org/proj/gs-elpa.git/snapshot/${P}.tar.gz" - -LICENSE="GPL-2" # v2 only -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -RDEPEND=">=app-portage/g-sorcery-0.2.3[${PYTHON_USEDEP}] - >=dev-python/sexpdata-0.0.4[${PYTHON_USEDEP}]" -BDEPEND="${RDEPEND}" - -python_install_all() { - distutils-r1_python_install_all - doman docs/*.8 -} diff --git a/app-portage/gs-elpa/gs-elpa-0.2.3.ebuild b/app-portage/gs-elpa/gs-elpa-0.2.3.ebuild deleted file mode 100644 index 592feb2e356f..000000000000 --- a/app-portage/gs-elpa/gs-elpa-0.2.3.ebuild +++ /dev/null @@ -1,25 +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,11} ) - -inherit distutils-r1 - -DESCRIPTION="g-sorcery backend for elisp packages" -HOMEPAGE="https://gitweb.gentoo.org/proj/gs-elpa.git" -SRC_URI="https://gitweb.gentoo.org/proj/gs-elpa.git/snapshot/${P}.tar.gz" - -LICENSE="GPL-2" # v2 only -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -RDEPEND=">=app-portage/g-sorcery-0.2.3[${PYTHON_USEDEP}] - >=dev-python/sexpdata-1.0.0[${PYTHON_USEDEP}]" -BDEPEND="${RDEPEND}" - -python_install_all() { - distutils-r1_python_install_all - doman docs/*.8 -} diff --git a/app-portage/gs-elpa/metadata.xml b/app-portage/gs-elpa/metadata.xml deleted file mode 100644 index 352a55249ae0..000000000000 --- a/app-portage/gs-elpa/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - gnu-emacs@gentoo.org - Gentoo GNU Emacs project - - - proj/gs-elpa - gentoo/gs-elpa - - diff --git a/app-portage/overlint/overlint-0.5.3-r5.ebuild b/app-portage/overlint/overlint-0.5.3-r5.ebuild new file mode 100644 index 000000000000..17fd77bb2283 --- /dev/null +++ b/app-portage/overlint/overlint-0.5.3-r5.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 + +DESCRIPTION="Simple tool for static analysis of overlays" +HOMEPAGE="https://cgit.gentoo.org/proj/overlint.git" +SRC_URI="https://www.hartwork.org/public/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]" diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest index 04638c103c4f..6968f5eba7d6 100644 --- a/app-portage/pfl/Manifest +++ b/app-portage/pfl/Manifest @@ -1,3 +1,2 @@ DIST pfl-3.4.tar.gz 18651 BLAKE2B 09793883a1ed6f70da2f01fb81cfafa407ed43584a826f2cd8fde6d75b544ed803a220fc517e649774100da32e64d01fad8ff0dcbaff9068f57cdf7bd4414169 SHA512 c21b43f234a778d74e05cd45b7ccb48b131d6998e632d044a4bccc2f772099d02d1c5e7ab75fc6f9deb14e2f1ed1f31bac51e917e628065b4a36d73b8d77336f -DIST pfl-3.5.1.tar.gz 20911 BLAKE2B 83057374eeadacecc96c8b46ae61847ab4f472d1c66b8070d9810aec977e72eb9379b6627def20e0cb21b739a7259b08aff589dd8e853c484a248725c3df328c SHA512 4260bd4822700a20cc38d2c325ee8af815af7d225335817ae10882fb1ebef5e7be9a412d0f26de5fc37ecc71a1853980f3627fdf8859711dfe418fe9c00a1ac3 DIST pfl-3.5.2.tar.gz 21248 BLAKE2B 28f4f05bc533f4b27cdbef7f2706ed99f885983e4f9e4f2580e07b772bef471eeca197a41d03059e28c2053869de4cb5295a9923dcba6f598bbf6e6be5e57185 SHA512 5f38b627cd5928396fe8202dd822756ed63b6dd80d98d1ee3da9998eb750070e9a921d652bbc7ed852e4944005f9d6c61c14c67be01c591f5c82ca50f869465e diff --git a/app-portage/pfl/pfl-3.5.1.ebuild b/app-portage/pfl/pfl-3.5.1.ebuild deleted file mode 100644 index 08f27aa7c608..000000000000 --- a/app-portage/pfl/pfl-3.5.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 systemd - -DESCRIPTION="Searchable online file/package database for Gentoo" -HOMEPAGE="https://www.portagefilelist.de https://github.com/portagefilelist/client" -SRC_URI="https://github.com/portagefilelist/client/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="+network-cron" - -RDEPEND=" - dev-python/requests[${PYTHON_USEDEP}] - dev-python/termcolor[${PYTHON_USEDEP}] - sys-apps/portage[${PYTHON_USEDEP}] - network-cron? ( sys-apps/util-linux[caps] ) -" - -S="${WORKDIR}/client-${PV}" - -python_install_all() { - if use network-cron ; then - exeinto /etc/cron.weekly - doexe cron/pfl - fi - - systemd_dounit systemd/pfl.{service,timer} - - keepdir /var/lib/${PN} - - distutils-r1_python_install_all -} - -pkg_postinst() { - if [[ ! -e "${EROOT}/var/lib/${PN}/pfl.info" ]]; then - touch "${EROOT}/var/lib/${PN}/pfl.info" || die - fi - chown -R portage:portage "${EROOT}/var/lib/${PN}" || die - chmod 775 "${EROOT}/var/lib/${PN}" || die -} diff --git a/app-portage/pfl/pfl-3.5.2.ebuild b/app-portage/pfl/pfl-3.5.2.ebuild index 08f27aa7c608..2020142b2ed2 100644 --- a/app-portage/pfl/pfl-3.5.2.ebuild +++ b/app-portage/pfl/pfl-3.5.2.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/portagefilelist/client/archive/${PV}.tar.gz -> ${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+network-cron" RDEPEND=" diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz index 22e5bef9bd73..06a90be4056d 100644 Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest index 2b4d60fa1cae..61f741ab5780 100644 --- a/app-shells/fzf/Manifest +++ b/app-shells/fzf/Manifest @@ -2,3 +2,5 @@ DIST fzf-0.44.0-deps.tar.xz 5618976 BLAKE2B ce47a70bdd475e77a645aab219ff63f25dea DIST fzf-0.44.0.tar.gz 250927 BLAKE2B 3689d8843a4b008abc7b77e7b0fe7b681891c5f397ac7460c26ea303e04e7bb7dcb03af4012cfea12dd8c771c012a656e8bc65684941d66ebbb6533796d09ec2 SHA512 62084284a2329250e87f107900ffaddf94043274b1d9ede1dacdeed2e8ef87722c80708addd7907c35035e742645f5168776e5f0295d5695e9512acdbb43936c DIST fzf-0.46.1-deps.tar.xz 5779780 BLAKE2B ef1364b81c353019b28f097a22a92e8dc641f05707624d198d91ea097a3a35f11c372c8a792eb1b6524640af3129062f596ee5abe384a7473bae4989a6d424b8 SHA512 daf703aca8933dbc44c28c2be9e339b4d17bb553fcd6e2b444b8347e553c38eb6e54a5e306aef84f0ca312d7108b13f8b810da5c964275d2045a95c3e5e09ad7 DIST fzf-0.46.1.tar.gz 258918 BLAKE2B 2beb5c5048ead73cc57c96aab26b9d331299473e0253bab4bc8cf0aea0be547266a0b1bca36aec9968de740e72d41d905eb0256f4690d9a3d55ec1acff5f6bbd SHA512 c2e07be08bc2d93981acfd9857f395e0c803046754d8d61e888fa4dc4d0f6f3d62eb19b518273cce23ae2eeffe68f2ecc692cb09cdcdfc30df9443419e3fc4cb +DIST fzf-0.49.0-deps.tar.xz 17668152 BLAKE2B 3f5c16b10c7605dec7b775df6c5d4e7dca15fa66c02a7fcacab82833ab0c5e86ca4c0ef5e4e40d12503196bca238b1b2bc23cdb964771b7cd810832c1d736211 SHA512 2e6ec8327858ce428ebe2d4288130c871d3bd64fea13bf861e613926b98ff53b4c840f8783f510f7e9ed3f4e121f5e21f49eddfd076296c9208ba87f53bffb40 +DIST fzf-0.49.0.tar.gz 264849 BLAKE2B 24a51f49384e2c45746181156de20fdb3c8e31c9b1e9bdc9866ba92f654d66b62e3a29afdce794bb23bba441591ab79737ef05716b34a13a76cce66bf24de02b SHA512 fe9d380e1fba460a45ce70a3b44681454833243881a133108f9087a204b1adaafae7bc13e083d25bc783eedb7d4998d5f2301c87f981c0368d081f7f60107fe8 diff --git a/app-shells/fzf/fzf-0.49.0.ebuild b/app-shells/fzf/fzf-0.49.0.ebuild new file mode 100644 index 000000000000..29107a6ca464 --- /dev/null +++ b/app-shells/fzf/fzf-0.49.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 go-module + +DESCRIPTION="General-purpose command-line fuzzy finder, written in Golang" +HOMEPAGE="https://github.com/junegunn/fzf" + +# For fancy versioning only. Bump on the next release! +# MY_GIT_REV is the first 7 characters of release commit, we truncate it +# after to make it easier to copy/paste. +MY_GIT_REV=62963dcefd6d74510ae2692cd0955177bae57543 +MY_GIT_REV=${MY_GIT_REV:0:7} + +SRC_URI="https://github.com/junegunn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${P}-deps.tar.xz" + +LICENSE="MIT BSD-with-disclosure" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + +src_prepare() { + default + sed -i 's/-s -w //' Makefile || die # bug #795225 +} + +src_compile() { + emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN} +} + +src_install() { + dobin bin/${PN} + doman man/man1/${PN}.1 + + dobin bin/${PN}-tmux + doman man/man1/${PN}-tmux.1 + + insinto /usr/share/vim/vimfiles/plugin + doins plugin/${PN}.vim + + insinto /usr/share/nvim/runtime/plugin + doins plugin/${PN}.vim + + newbashcomp shell/completion.bash ${PN} + + insinto /usr/share/zsh/site-functions + newins shell/completion.zsh _${PN} + + insinto /usr/share/fzf + doins shell/key-bindings.bash + doins shell/key-bindings.fish + doins shell/key-bindings.zsh +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "To add fzf support to your shell, make sure to use the right file" + elog "from ${EROOT}/usr/share/fzf." + elog + elog "For bash, add the following line to ~/.bashrc:" + elog + elog " # source ${EROOT}/usr/share/bash-completion/completions/fzf" + elog " # source ${EROOT}/usr/share/fzf/key-bindings.bash" + elog + elog "Plugins for Vim and Neovim are installed to respective directories" + elog "and will work out of the box." + elog + elog "For fzf support in tmux see fzf-tmux(1)." + fi +} diff --git a/app-shells/powerline/powerline-2.7-r3.ebuild b/app-shells/powerline/powerline-2.7-r3.ebuild index 829720104c3f..b761ad56034e 100644 --- a/app-shells/powerline/powerline-2.7-r3.ebuild +++ b/app-shells/powerline/powerline-2.7-r3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) PYPI_NO_NORMALIZE=1 PYPI_PN="powerline-status" DISTUTILS_USE_PEP517=setuptools diff --git a/app-shells/powerline/powerline-9999.ebuild b/app-shells/powerline/powerline-9999.ebuild index 645322a6f82a..25428eb6c66a 100644 --- a/app-shells/powerline/powerline-9999.ebuild +++ b/app-shells/powerline/powerline-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) PYPI_NO_NORMALIZE=1 PYPI_PN="powerline-status" DISTUTILS_USE_PEP517=setuptools diff --git a/app-shells/tmux-bash-completion/tmux-bash-completion-9999.ebuild b/app-shells/tmux-bash-completion/tmux-bash-completion-9999.ebuild index da4498863deb..f07081870306 100644 --- a/app-shells/tmux-bash-completion/tmux-bash-completion-9999.ebuild +++ b/app-shells/tmux-bash-completion/tmux-bash-completion-9999.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit bash-completion-r1 git-r3 DESCRIPTION="bash-completion scripts for tmux" @@ -10,13 +11,11 @@ EGIT_REPO_URI="https://github.com/imomaliev/tmux-bash-completion.git" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="" DEPEND=" >=app-misc/tmux-2.2 app-shells/bash-completion - " +" RDEPEND="${DEPEND}" src_install() { diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz index 96d99f93fb5c..0d3f8514459c 100644 Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ diff --git a/app-text/atril/atril-1.28.0.ebuild b/app-text/atril/atril-1.28.0.ebuild index 66e489ce9208..189aa88ef920 100644 --- a/app-text/atril/atril-1.28.0.ebuild +++ b/app-text/atril/atril-1.28.0.ebuild @@ -24,6 +24,7 @@ COMMON_DEPEND=" app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libxml2:2 + >=mate-base/mate-desktop-1.27.1 sys-libs/zlib x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[introspection?] diff --git a/app-text/cedilla/cedilla-0.7-r1.ebuild b/app-text/cedilla/cedilla-0.7-r1.ebuild new file mode 100644 index 000000000000..ba9a1e203dc8 --- /dev/null +++ b/app-text/cedilla/cedilla-0.7-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="UTF-8 to postscript converter" +HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/cedilla/ + https://github.com/jech/cedilla" +SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="dev-lisp/clisp" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/cedilla-gentoo-r1.patch ) + +src_compile() { + ./compile-cedilla || die "Compile failed." +} + +src_install() { + sed "s#${ED}##g" -i cedilla || die "sed failed" + dodir /usr/share/man/man1/ + + ./install-cedilla || die "Install failed." + + einstalldocs +} diff --git a/app-text/cedilla/metadata.xml b/app-text/cedilla/metadata.xml index f8003ca6d190..432003501472 100644 --- a/app-text/cedilla/metadata.xml +++ b/app-text/cedilla/metadata.xml @@ -5,4 +5,7 @@ titanofold@gentoo.org Aaron W. Swenson + + jech/cedilla + diff --git a/app-text/cmark/cmark-0.31.0.ebuild b/app-text/cmark/cmark-0.31.0.ebuild index da5a39b33e87..9d990ce41277 100644 --- a/app-text/cmark/cmark-0.31.0.ebuild +++ b/app-text/cmark/cmark-0.31.0.ebuild @@ -19,6 +19,10 @@ RESTRICT="!test? ( test )" BDEPEND="test? ( ${PYTHON_DEPS} )" +PATCHES=( + "${FILESDIR}/cmark-0.31.0_fix_api_test.patch" +) + pkg_setup() { use test && python-any-r1_pkg_setup } diff --git a/app-text/cmark/files/cmark-0.31.0_fix_api_test.patch b/app-text/cmark/files/cmark-0.31.0_fix_api_test.patch new file mode 100644 index 000000000000..defecc445c4e --- /dev/null +++ b/app-text/cmark/files/cmark-0.31.0_fix_api_test.patch @@ -0,0 +1,17 @@ +https://github.com/commonmark/cmark/commit/a739d4911b5fa5586679b8e55999719cc910d26b +From: John MacFarlane +Date: Wed, 13 Mar 2024 14:31:28 -0700 +Subject: [PATCH] Flag root node as open... + +in `cmark_parser_new_with_mem_into_root`. Closes #532. +--- a/src/blocks.c ++++ b/src/blocks.c +@@ -98,6 +98,8 @@ cmark_parser *cmark_parser_new_with_mem_into_root(int options, cmark_mem *mem, c + cmark_strbuf_init(mem, &parser->linebuf, 0); + cmark_strbuf_init(mem, &parser->content, 0); + ++ root->flags = CMARK_NODE__OPEN; ++ + parser->refmap = cmark_reference_map_new(mem); + parser->root = root; + parser->current = root; diff --git a/app-text/crengine-ng/Manifest b/app-text/crengine-ng/Manifest index 56d8f6835953..e31b16954f84 100644 --- a/app-text/crengine-ng/Manifest +++ b/app-text/crengine-ng/Manifest @@ -1,3 +1,2 @@ -DIST crengine-ng-0.9.10.tar.bz2 3416315 BLAKE2B ea1e4aa13c8ab233f26a2878a138cbdf8c371cdcdb86103a91bf09eb3ae3f060da76b5d32fb6d70236b3f9c787876d3f87a4caed353a51942f78b9cd25c11202 SHA512 7cb51ebaf7a62ce996f84deed2d61eef2b5adc76743755aa33e13d53a00409eaba41898f1f613973d3f361529d661952bca690c239f1e7536fcb153d120df83d DIST crengine-ng-0.9.11.tar.bz2 4026770 BLAKE2B 27137f3177a9aacc47b4b2ef38ed9baba81d987c46232247686cdbc307b9602fb1d5a915240d4712ca05ac49c7d263e49cf14dbf1b126e8c31862e62d56e742d SHA512 0014060f13e04432bba4c00885bc0c4cbf094d9d69cd8544b995d40bd569d690b5ebd8f02ab8ecba3d7f4bca6154a753a26690aacd96a19870dc2fdacf625f33 DIST freefont-otf-20120503.tar.gz 4487813 BLAKE2B a280bef885bc71897a8475814602d7537b05d14a70e5857acd1007bc0a074be9db1e08fbd63fcabf3fde7874391bdd319d00b213e29b203d474fb320e91b82a2 SHA512 cee9a573b17ccc689b61f0925fb6624d58e3a3369d996e379e70c3a4cd750429d68c14c85fbcab4381101c8f4bf56730ef40e0045fdd79647019db41b4ec74fd diff --git a/app-text/crengine-ng/crengine-ng-0.9.10.ebuild b/app-text/crengine-ng/crengine-ng-0.9.10.ebuild deleted file mode 100644 index 2941ba39c36d..000000000000 --- a/app-text/crengine-ng/crengine-ng-0.9.10.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit cmake - -DESCRIPTION="Cross-platform library designed to implement e-book readers" -HOMEPAGE="https://gitlab.com/coolreader-ng/crengine-ng" -SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2" -SRC_URI+=" test? ( mirror://gnu/freefont/freefont-otf-20120503.tar.gz )" - -LICENSE="GPL-2+" -SLOT="0/5" -KEYWORDS="amd64 ~arm64 x86" -IUSE="+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc static-libs test" - -RESTRICT="!test? ( test )" - -CDEPEND="sys-libs/zlib - png? ( media-libs/libpng:0 ) - jpeg? ( media-libs/libjpeg-turbo ) - >=media-libs/freetype-2.10.0 - harfbuzz? ( media-libs/harfbuzz:=[truetype] ) - libunibreak? ( dev-libs/libunibreak:= ) - fribidi? ( dev-libs/fribidi ) - zstd? ( app-arch/zstd:= ) - libutf8proc? ( dev-libs/libutf8proc:= ) - fontconfig? ( media-libs/fontconfig )" - -RDEPEND="${CDEPEND}" -DEPEND=" - ${RDEPEND} - test? ( dev-cpp/gtest - app-arch/zip ) -" -BDEPEND="virtual/pkgconfig - ${CDEPEND}" - -src_prepare() { - cmake_src_prepare - if use test; then - mkdir -p "${BUILD_DIR}/crengine/tests/fonts/" - cp -p "${WORKDIR}/freefont-20120503/"*.otf "${BUILD_DIR}/crengine/tests/fonts/" - fi -} - -src_configure() { - CMAKE_BUILD_TYPE="Release" - local mycmakeargs=( - -DCRE_BUILD_SHARED=ON - -DCRE_BUILD_STATIC=$(usex static-libs) - -DUSE_COLOR_BACKBUFFER=ON - -DWITH_LIBPNG=$(usex png) - -DWITH_LIBJPEG=$(usex jpeg) - -DWITH_FREETYPE=ON - -DWITH_HARFBUZZ=$(usex harfbuzz) - -DWITH_LIBUNIBREAK=$(usex libunibreak) - -DWITH_FRIBIDI=$(usex fribidi) - -DWITH_ZSTD=$(usex zstd) - -DWITH_UTF8PROC=$(usex libutf8proc) - -DUSE_GIF=$(usex gif) - -DUSE_NANOSVG=$(usex svg) - -DUSE_CHM=$(usex chm) - -DUSE_ANTIWORD=ON - -DUSE_FONTCONFIG=$(usex fontconfig) - -DUSE_SHASUM=OFF - -DUSE_CMARK_GFM=ON - -DBUILD_TOOLS=OFF - -DENABLE_UNITTESTING=$(usex test) - -DOFFLINE_BUILD_MODE=ON - ) - cmake_src_configure -} - -src_test() { - cd "${BUILD_DIR}/crengine/tests" - ./unittests -} diff --git a/app-text/crengine-ng/crengine-ng-0.9.11.ebuild b/app-text/crengine-ng/crengine-ng-0.9.11.ebuild index 5725b0dbd9a8..f8228762d42d 100644 --- a/app-text/crengine-ng/crengine-ng-0.9.11.ebuild +++ b/app-text/crengine-ng/crengine-ng-0.9.11.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2 LICENSE="GPL-2+" SLOT="0/6" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc static-libs test" RESTRICT="!test? ( test )" diff --git a/app-text/crqt-ng/Manifest b/app-text/crqt-ng/Manifest index 1de145d2cf86..2c58fcc18213 100644 --- a/app-text/crqt-ng/Manifest +++ b/app-text/crqt-ng/Manifest @@ -1,3 +1 @@ -DIST crqt-ng-1.0.11.tar.bz2 442916 BLAKE2B 3eb4c73f1c3b3c88d92cb6ed5bf4895329caab1391c7be05dc0ccc1a65546f7761ee7af6246045be70137fd8683e2bfc5fb41df3dad604177ae4c0351f44c74e SHA512 62bb4b8a3dec3dd9fba5e1a2795f384e5310b87800d89e15b7f4fe258eb923481f1264ec23645b09f5ae89822e332d1499aeca0a79efab21124b43deec3ada44 -DIST crqt-ng-1.0.12.tar.bz2 443646 BLAKE2B 338c96a9c34d6a05ed6fa9cd1d6fe63665518e8c12e835a7fba22b81585116f9e579b326c9fc22a67d7225f0ca4cc15035179be923507b0af7032666f05d972e SHA512 24258c32dac6ba24833d7a6a227cef6dfb39ff415781921c90e57cd9c73ce187255bcffee3b38719b38dde2f6cb8a0569f5b25db88688c105f8b24246676207d DIST crqt-ng-1.0.13.tar.bz2 444509 BLAKE2B 7f69f1ea509cff8610f62539a66c9ce7a805660da6c4188c7e0c966b1f3f63932302ace0b70e0a21c2eaa7dfbfba1ef37ceda7e64b520d248eeb671d3f35ff1d SHA512 7857efedb641635e386ca16cdb8789b77641e593bf78f3a89ed0ac8c3d91d87c14de8cf32722b36290261c55975ea250768ac525caa279b15a35bddbde62609c diff --git a/app-text/crqt-ng/crqt-ng-1.0.11-r1.ebuild b/app-text/crqt-ng/crqt-ng-1.0.11-r1.ebuild deleted file mode 100644 index 91668595d66e..000000000000 --- a/app-text/crqt-ng/crqt-ng-1.0.11-r1.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 -PLOCALES="bg cs hu nl ru uk" -inherit cmake plocale xdg - -DESCRIPTION="Cross-platform e-book reader" -HOMEPAGE="https://gitlab.com/coolreader-ng/crqt-ng" -SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc" - -CDEPEND=">=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5" -RDEPEND="${CDEPEND}" -BDEPEND="${CDEPEND} - dev-qt/linguist-tools:5" - -src_prepare() { - cmake_src_prepare - xdg_environment_reset - - # locales - plocale_find_changes "${S}"/src/i18n 'crqt_' '.ts' - sed -e "s|set(LANGUAGES .*)|set(LANGUAGES $(plocale_get_locales))|i" \ - -i "${S}"/src/CMakeLists.txt \ - || die "sed CMakeLists.txt failed" -} - -src_configure() { - CMAKE_USE_DIR="${S}" - CMAKE_BUILD_TYPE="Release" - local mycmakeargs=(-DUSE_QT=QT5) - cmake_src_configure -} diff --git a/app-text/crqt-ng/crqt-ng-1.0.12.ebuild b/app-text/crqt-ng/crqt-ng-1.0.12.ebuild deleted file mode 100644 index 17278e64b54d..000000000000 --- a/app-text/crqt-ng/crqt-ng-1.0.12.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 -PLOCALES="bg cs hu nl ru uk" -inherit cmake plocale xdg - -DESCRIPTION="Cross-platform e-book reader" -HOMEPAGE="https://gitlab.com/coolreader-ng/crqt-ng" -SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc" - -CDEPEND=">=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5" -RDEPEND="${CDEPEND}" -BDEPEND="${CDEPEND} - dev-qt/linguist-tools:5" - -src_prepare() { - cmake_src_prepare - xdg_environment_reset - - # locales - plocale_find_changes "${S}"/src/i18n 'crqt_' '.ts' - sed -e "s|set(LANGUAGES .*)|set(LANGUAGES $(plocale_get_locales))|i" \ - -i "${S}"/src/CMakeLists.txt \ - || die "sed CMakeLists.txt failed" -} - -src_configure() { - CMAKE_USE_DIR="${S}" - CMAKE_BUILD_TYPE="Release" - local mycmakeargs=(-DUSE_QT=QT5) - cmake_src_configure -} diff --git a/app-text/crqt-ng/crqt-ng-1.0.13.ebuild b/app-text/crqt-ng/crqt-ng-1.0.13.ebuild index 0191ef0b7f1c..de0e7855551b 100644 --- a/app-text/crqt-ng/crqt-ng-1.0.13.ebuild +++ b/app-text/crqt-ng/crqt-ng-1.0.13.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc" CDEPEND=">=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest index 9324c7998dbb..e0cde0b11fd0 100644 --- a/app-text/enchant/Manifest +++ b/app-text/enchant/Manifest @@ -1,3 +1,2 @@ DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036 -DIST enchant-2.5.0.tar.gz 990061 BLAKE2B 297274e48de094815bc5bc105beebf6c3aa41d0d424ce277b348452cfaf2a07e3b71821dd63a0322e14fd3f8635b6d6a40fc84ea888aef9eb31175061149ef67 SHA512 3ab209b0b87b7cd8f94dd2bceed126d0e36252a1ede7a30b1550169555242784a631c0f259b0fe6591771da491ab934cac48f833029ba78dd779fc1ed91341fe DIST enchant-2.6.1.tar.gz 1014436 BLAKE2B 3df1d72d4fa2e912788d4e12e7bc4ab2676952e358e97457259284e78c32006482be0713059d5feeef56905e83ded975e7d723563c58e4f92c845b0b279a6827 SHA512 e2faabeb6a4edc7237a0a279b210512100fb1662b097cd23f0fc07a3519e48632e5527b0d393793a7623667011eae7e11f15fcddcaa155c4abd26ab6981ddf44 diff --git a/app-text/enchant/enchant-2.5.0.ebuild b/app-text/enchant/enchant-2.5.0.ebuild deleted file mode 100644 index 22f22e0ed91a..000000000000 --- a/app-text/enchant/enchant-2.5.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit libtool - -DESCRIPTION="Spellchecker wrapping library" -HOMEPAGE="https://abiword.github.io/enchant/" -SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" - -IUSE="aspell +hunspell nuspell test voikko" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( aspell hunspell nuspell )" - -COMMON_DEPEND=" - >=dev-libs/glib-2.6:2 - aspell? ( app-text/aspell ) - hunspell? ( >=app-text/hunspell-1.2.1:0= ) - nuspell? ( >=app-text/nuspell-5.1.0:0= ) - voikko? ( dev-libs/libvoikko:= ) -" -RDEPEND="${COMMON_DEPEND} - ! -Date: Thu, 22 Sep 2022 08:20:11 +0200 -Subject: [PATCH] Revert "Add GDA 6 compatibility" - -This reverts commit 27c3f164422c193246aa4f71facf77d2a97ee94c ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 076812bd..f734e496 100644 ---- a/meson.build -+++ b/meson.build -@@ -111,7 +111,7 @@ gtr_deps = [ - glib_dep, - gtk_dep, - libhandy_dep, -- dependency('libgda-6.0'), -+ dependency('libgda-5.0'), - dependency('gio-2.0', version: '>= 2.36.0'), - dependency('gsettings-desktop-schemas'), - dependency('gspell-1', version: '>= 1.2.0'), --- -2.35.1 - diff --git a/app-text/gtranslator/gtranslator-42.0.ebuild b/app-text/gtranslator/gtranslator-42.0.ebuild deleted file mode 100644 index c0153cbc9a0b..000000000000 --- a/app-text/gtranslator/gtranslator-42.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson xdg - -DESCRIPTION="GNOME Translation Editor" -HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="gtk-doc" - -DEPEND=" - >=dev-libs/glib-2.71.3:2 - >=x11-libs/gtk+-3.22.20:3 - >=gui-libs/libhandy-1.5.0:1 - gnome-extra/libgda:5= - gnome-base/gsettings-desktop-schemas - >=app-text/gspell-1.2.0:= - >=x11-libs/gtksourceview-4.0.2:4 - >=dev-libs/libxml2-2.4.12:2 - net-libs/libsoup:3.0 - >=dev-libs/json-glib-1.2.0 -" -RDEPEND="${DEPEND}" -BDEPEND=" - dev-libs/appstream-glib - dev-libs/libxml2:2 - dev-util/glib-utils - gtk-doc? ( - >=dev-util/gtk-doc-1.28 - app-text/docbook-xml-dtd:4.1.2 - ) - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-Revert-Add-GDA-6-compatibility.patch -) - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc gtk_doc) - -Dprofile=default - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-text/gtranslator/gtranslator-45.2.ebuild b/app-text/gtranslator/gtranslator-45.2.ebuild deleted file mode 100644 index b07e299522fa..000000000000 --- a/app-text/gtranslator/gtranslator-45.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson xdg - -DESCRIPTION="GNOME Translation Editor" -HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="gtk-doc" - -DEPEND=" - >=dev-libs/glib-2.71.3:2 - >=gui-libs/gtk-4.6.0:4 - >=gui-libs/libadwaita-1.1.0 - gnome-extra/libgda:5= - gnome-base/gsettings-desktop-schemas - >=gui-libs/gtksourceview-5.4.0:5 - >=dev-libs/libxml2-2.4.12:2 - net-libs/libsoup:3.0 - >=dev-libs/json-glib-1.2.0 -" -RDEPEND="${DEPEND}" -BDEPEND=" - dev-libs/appstream-glib - dev-libs/libxml2:2 - dev-util/glib-utils - gtk-doc? ( - >=dev-util/gtk-doc-1.28 - app-text/docbook-xml-dtd:4.1.2 - ) - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-Revert-Add-GDA-6-compatibility.patch -) - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc gtk_doc) - -Dprofile=default - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-text/htp/htp-1.19.ebuild b/app-text/htp/htp-1.19.ebuild deleted file mode 100644 index da6613e0dfbc..000000000000 --- a/app-text/htp/htp-1.19.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="An HTML preprocessor" -HOMEPAGE="http://htp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="Clarified-Artistic" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" - -RESTRICT="test" - -QA_PRESTRIPPED="/usr/bin/htp" - -src_compile() { - emake \ - CCOPT="-c ${CFLAGS} ${CPPFLAGS} -DHAVE_SNPRINTF -DHAVE_VASPRINTF -DHAVE_ASPRINTF" \ - CC="$(tc-getCC)" \ - LINK='$(CC) $(LDFLAGS)' -} - -src_install() { - emake \ - DESTDIR="${D}" \ - prefix='$(DESTDIR)/usr' \ - pkgdocdir='$(DESTDIR)/usr/share/doc/${PF}/html' \ - install -} diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest index 302c960ec1c9..0f1bd88a2f75 100644 --- a/app-text/iso-codes/Manifest +++ b/app-text/iso-codes/Manifest @@ -1,2 +1 @@ -DIST iso-codes-v4.15.0.tar.gz 15046318 BLAKE2B fc4a9dd6a80fbd7658e0ba30f483a57f7d487f5eb7cc73ac2504d24397f1a8519acf8bf2431b18f969cbe4dd8e386cedd82c9284d405c57c6682af7639b4aacb SHA512 1700c5c24a5a8c278df67539d7d99cae832a72e2fc604394b15af17cad78e36a9280e0a91ecaeade9e14b9f6431967ef2d2e662e73d200773e63455b0e1c5187 DIST iso-codes-v4.16.0.tar.gz 15163129 BLAKE2B 8fcdb3c12c502c1e14169765db9c9dd7778fc5d4bb0da37aa6b27efeebd5ce9f3e825e5b1a7ae8d659babf2d6b9124af08b40ed8a2a1235e88df50be9c204ca5 SHA512 04d93eb37ff309c850a1af6d4cf6bb92a16e25ee35ee12e16325f6e7b476ba40bbf5d11e2f4c425111220480911b1dbc9e244189ea7487f1f0ea4dbce2307c96 diff --git a/app-text/iso-codes/iso-codes-4.15.0.ebuild b/app-text/iso-codes/iso-codes-4.15.0.ebuild deleted file mode 100644 index b6a055f1caaf..000000000000 --- a/app-text/iso-codes/iso-codes-4.15.0.ebuild +++ /dev/null @@ -1,79 +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} ) -PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_BD bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fil fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kmr kn ko kok kv kw ky lo lt lv mai mhr mi mk ml mn mo mr ms mt my na nah nb nb_NO ne nl nn nso nv oc or pa pa_PK pap pi pl ps pt pt_BR ro ro_MD ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif tzm ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hans zh_Hant zh_TW zu" - -inherit python-any-r1 - -DESCRIPTION="ISO language, territory, currency, script codes and their translations" -HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes" -SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - -BDEPEND="${PYTHON_DEPS} - sys-devel/gettext -" -S="${WORKDIR}/${PN}-v${PV}" - -# This ebuild does not install any binaries. -RESTRICT="binchecks strip" - -DOCS=( CHANGELOG.md README.md ) - -# plocale_find_changes doesn't support multiple directories, -# so need to do the update scan ourselves. -check_existing_locales() { - local std loc all_locales=() - - ebegin "Looking for new locales" - for std in "${all_stds[@]}"; do - pushd "${std}" >/dev/null || die - for loc in *.po; do - all_locales+=( "${loc%.po}" ) - done - popd >/dev/null - done - - all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u)) - if [[ ${PLOCALES} != "${all_locales}" ]]; then - eend 1 - eerror "There are changes in locales! This ebuild should be updated to:" - eerror "PLOCALES=\"${all_locales}\"" - die "Update PLOCALES in the ebuild" - else - eend 0 - fi -} - -src_prepare() { - default - - local std loc mylinguas - local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} ) - - check_existing_locales - - # Modify the Makefiles so they only install requested locales. - for std in "${all_stds[@]}"; do - einfo "Preparing ${std} ..." - pushd "${std}" >/dev/null || die - mylinguas=() - for loc in *.po; do - if has ${loc%.po} ${LINGUAS-${loc%.po}}; then - mylinguas+=( "${loc}" ) - fi - done - - sed \ - -e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \ - -e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \ - -i Makefile.am Makefile.in || die "sed in ${std} folder failed" - popd >/dev/null - done -} diff --git a/app-text/paper-clip/Manifest b/app-text/paper-clip/Manifest index be8bc05d41ed..71dac68e6efc 100644 --- a/app-text/paper-clip/Manifest +++ b/app-text/paper-clip/Manifest @@ -1,2 +1 @@ -DIST paper-clip-3.6.tar.gz 171190 BLAKE2B a31673c9c3a1f889a63561a244d966195dac2738eb4070dfd01807c7406c7f8acb0277509c6924de37068aa904c3f1ee4f6de3882bf734470b67dd77b34afcf3 SHA512 4ebfa6789d31f85dc6b38119f7fb1f88ca06a32872ab1341d4a4fcd898eb3c672673a630d56f373294c053bdcee7573206a5fe89da45b76366f65e9bb441451a DIST paper-clip-5.0.tar.gz 182085 BLAKE2B 07c397218417a5bc87e95aec577465b3f109de4c081bf0f208e0213b71ea7a8f9bac415221a04c8729add7d82adf98c859b60b1b0bd9dbef2db021ee80ff9296 SHA512 2757768414b2177511b61c0a9bde9710b67128a446640bb3ae3bba22a9b30a2b8b036ee32806dc6e4662ffc3d06254006b89e6b63cdc11950b38257e9ea46023 diff --git a/app-text/paper-clip/paper-clip-3.6.ebuild b/app-text/paper-clip/paper-clip-3.6.ebuild deleted file mode 100644 index b2ed96834bc3..000000000000 --- a/app-text/paper-clip/paper-clip-3.6.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -REAL_PN="Paper-Clip" - -inherit gnome2-utils meson vala xdg - -DESCRIPTION="Edit the title, author, keywords and more details of PDF documents" -HOMEPAGE="https://github.com/Diego-Ivan/Paper-Clip/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/Diego-Ivan/${REAL_PN}.git" -else - SRC_URI="https://github.com/Diego-Ivan/${REAL_PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - S="${WORKDIR}/${REAL_PN}-${PV}" - - KEYWORDS="amd64 ~x86" -fi - -LICENSE="GPL-3+" -SLOT="0" -RESTRICT="test" # Only validations, the appdata one fails. - -RDEPEND=" - app-text/poppler:=[cairo,introspection] - dev-libs/glib:2 - dev-libs/gobject-introspection - dev-libs/libportal:=[gtk,introspection,vala] - gui-libs/gtk:4 - gui-libs/libadwaita:1[introspection,vala] -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - $(vala_depend) - dev-libs/appstream-glib - dev-util/desktop-file-utils -" - -DOCS=( README.md ) - -src_prepare() { - default - vala_setup -} - -src_install() { - meson_src_install - einstalldocs - - # Symlink "pdf-metadata-editor" (old name?) to "${PN}" - dosym -r /usr/bin/pdf-metadata-editor "/usr/bin/${PN}" - - mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo" || die -} - -pkg_postinst() { - gnome2_schemas_update - xdg_pkg_postinst -} - -pkg_postrm() { - gnome2_schemas_update - xdg_pkg_postrm -} diff --git a/app-text/rnc2rng/Manifest b/app-text/rnc2rng/Manifest index efd19aa84b7a..86ed0c9de3fc 100644 --- a/app-text/rnc2rng/Manifest +++ b/app-text/rnc2rng/Manifest @@ -1 +1,2 @@ DIST rnc2rng-2.6.6.tar.gz 18089 BLAKE2B be9b2a22770bed034b4ad93bba23dba7e1f58c553cef4e1a507a00ffb62c6f6e937df22e4d5f2fd3c542acebd72adb82320cddf34f873d35f442be0d457b3cba SHA512 a0f108383ad927c2d9e1cc11960ddaab99a8cb4bf0417cd8e7ccdbc7925746b2fa8c1cbd96a74e89f7166eb8e330c224a49d97aa2ef5d83d7a0c4254240fb308 +DIST rnc2rng-2.7.0.tar.gz 19000 BLAKE2B 37375d2608c2fc5ffb87521de8d83f0d4a70449d399ea6d181b40c7e6f561c27e0e2ac6d4df5b0086890b626366cd6b8ceca60580f05a3bbd152d7315808fb1f SHA512 29507e49d29f7da23dcf24fd1328dd4ee0aa37192817d6d2c9ec76ede56a1c6b041ffdb6b755e2e9b0c155f4f68616cb7f9a49e711e4e389097c97840b5e3e66 diff --git a/app-text/rnc2rng/rnc2rng-2.6.6-r3.ebuild b/app-text/rnc2rng/rnc2rng-2.6.6-r3.ebuild index e291b8cc981a..6128abda57bf 100644 --- a/app-text/rnc2rng/rnc2rng-2.6.6-r3.ebuild +++ b/app-text/rnc2rng/rnc2rng-2.6.6-r3.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,10,11} ) +PYTHON_COMPAT=( python3_{9,10,11,12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 pypi diff --git a/app-text/rnc2rng/rnc2rng-2.7.0.ebuild b/app-text/rnc2rng/rnc2rng-2.7.0.ebuild new file mode 100644 index 000000000000..6128abda57bf --- /dev/null +++ b/app-text/rnc2rng/rnc2rng-2.7.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9,10,11,12} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 pypi + +DESCRIPTION="RELAX NG Compact to regular syntax conversion library" +HOMEPAGE="https://github.com/djc/rnc2rng" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-python/rply[${PYTHON_USEDEP}]" +BDEPEND="test? ( ${RDEPEND} )" + +python_test() { + "${EPYTHON}" test.py -v || die "Tests failed with ${EPYTHON}" +} diff --git a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r2.ebuild b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r2.ebuild new file mode 100644 index 000000000000..3e3ec497a77e --- /dev/null +++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DTD_FILE="scrollkeeper-omf.dtd" + +DESCRIPTION="DTD from the Scrollkeeper package" +HOMEPAGE="https://scrollkeeper.sourceforge.net/" +SRC_URI="https://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FILE}" +S="${WORKDIR}" + +LICENSE="FDL-1.1" +SLOT="1.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +RDEPEND=">=dev-libs/libxml2-2.4.19" +DEPEND="${RDEPEND}" + +src_unpack() { :; } + +src_configure() { :; } + +src_compile() { :; } + +src_install() { + insinto /usr/share/xml/scrollkeeper/dtds + doins "${DISTDIR}/${DTD_FILE}" +} + +pkg_postinst() { + einfo "Installing catalog..." + + # Install regular DOCTYPE catalog entry + "${EROOT}"/usr/bin/xmlcatalog --noout --add "public" \ + "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \ + "${EROOT}"/usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \ + "${EROOT}"/etc/xml/catalog + + # Install catalog entry for calls like: xmllint --dtdvalid URL ... + "${EROOT}"/usr/bin/xmlcatalog --noout --add "system" \ + "${SRC_URI}" \ + "${EROOT}"/usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \ + "${EROOT}"/etc/xml/catalog +} + +pkg_postrm() { + # Remove all sk-dtd from the cache + einfo "Cleaning catalog..." + + "${EROOT}"/usr/bin/xmlcatalog --noout --del \ + "${EROOT}"/usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \ + "${EROOT}"/etc/xml/catalog +} diff --git a/app-text/texlive-core/texlive-core-2023-r6.ebuild b/app-text/texlive-core/texlive-core-2023-r6.ebuild index 4c3cc6a99092..31dfa7b9c7bf 100644 --- a/app-text/texlive-core/texlive-core-2023-r6.ebuild +++ b/app-text/texlive-core/texlive-core-2023-r6.ebuild @@ -187,6 +187,7 @@ RDEPEND=" !=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + cmake_src_bootstrap + fi +} + +src_configure() { + # Fix linking on Solaris + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl + + # ODR warnings, bug #858335 + # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 + filter-lto + + local mycmakeargs=( + -DCMAKE_USE_SYSTEM_LIBRARIES=ON + -DCMake_ENABLE_DEBUGGER=$(usex dap) + -DCMAKE_DOC_DIR=/share/doc/${PF} + -DCMAKE_MAN_DIR=/share/man + -DCMAKE_DATA_DIR=/share/${PN} + -DSPHINX_MAN=$(usex doc) + -DSPHINX_HTML=$(usex doc) + -DBUILD_CursesDialog="$(usex ncurses)" + -DBUILD_TESTING=$(usex test) + -DBUILD_QtDialog=$(usex gui) + ) + + use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=$(usex qt6 6 5) ) + + cmake_src_configure +} + +src_test() { + # Fix OutDir and SelectLibraryConfigurations tests + # these are altered thanks to our eclass + sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ + || die + + pushd "${BUILD_DIR}" > /dev/null || die + + # Excluded tests: + # BootstrapTest: we actualy bootstrap it every time so why test it. + # BundleUtilities: bundle creation broken + # CMakeOnly.AllFindModules: pthread issues + # CTest.updatecvs: which fails to commit as root + # Fortran: requires fortran + # RunCMake.CompilerLauncher: also requires fortran + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because + # debugedit binary is not in the expected location + # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because + # it can't find a deb package that owns libc + # TestUpload, which requires network access + # RunCMake.CMP0125, known failure reported upstream (bug #829414) + local myctestargs=( + --output-on-failure + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \ + ) + + virtx cmake_src_test +} + +src_install() { + cmake_src_install + + # If USE=doc, there'll be newly generated docs which we install instead. + if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] + fi + + insinto /usr/share/vim/vimfiles/syntax + doins Auxiliary/vim/syntax/cmake.vim + + insinto /usr/share/vim/vimfiles/indent + doins Auxiliary/vim/indent/cmake.vim + + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/${PN}.vim" + + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} +} + +pkg_postinst() { + if use gui; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} + +pkg_postrm() { + if use gui; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} diff --git a/dev-build/scons/Manifest b/dev-build/scons/Manifest index c041143dcd72..6c50ca06785e 100644 --- a/dev-build/scons/Manifest +++ b/dev-build/scons/Manifest @@ -1,8 +1,4 @@ -DIST SCons-4.6.0.tar.gz 3230138 BLAKE2B adef2ad5394404ae48d85e8c2a91b5af29e4f9bfa7455504ac1cb8d22d9a05c9ace823e02c8e7a32b34dee281635987487ad43ca94c6adea8e287b086a0732f0 SHA512 c7dc952117c23ac30b8cf1f70ef0c4ad1c0a86c9865fd255fde1a29ea2fbf9e26573b73430f6adc8c545dab753077f380d29d77ac4eede7fce959c86576d2354 DIST SCons-4.7.0.tar.gz 3220744 BLAKE2B 0fe8cdbaef46ca6571de35fb6544afe992e8a509cf52a8078133584e3af63919d2e0fb83ad646e042290fc47ca5a8932435946df9d40a099ccb2105b54bfd5cd SHA512 d08fba3e7f058eb2eeee4a129d10b55affada6b192932f069271fcbc28fd8216b2bf7e94285d9c448235a3965a789d3a91db9ebae1945aa73306788009dd2e77 -DIST scons-4.6.0-user.html 1670870 BLAKE2B 0c84248791bdce093cce4d45b525357aeb3ae69835337000d753b007dc77053d63e70363b3d73c3e7c8157b24d50f0a0216ea9993d90bb298ba2591d6fce4cb4 SHA512 5b8a2626bca361dbce1b0b40f6009752b2dbde7e1f5886b449b9015514951b2e998ede0582876411e7cde56b4ea05546e2db8a8fdcada349c39a126c2e50be1a -DIST scons-4.6.0-user.pdf 3058220 BLAKE2B 3a04e1c0fab47f2a1327f20d3ee500d7861599dc31b0007dd196173af5b880d9737ff528b419896e905cae5a5744c74ef38c2b29bc7945ef4157a79c1c6dabe9 SHA512 6a5ca9cdede81ec9536bb32d7df157fd1efd4b3e3f5afa386b7ecaa45d1fc212015673ccec5ab3283475ab0ee6ef001c111f51b7d3bb64dda664e61d11cbaec0 -DIST scons-4.6.0.gh.tar.gz 5891032 BLAKE2B 9aeda2ef899dcaf5bc7ca3bc77c0615544f2308f56ef095ad835d5cc748355b467a905ec737eef61a4afd183ff0f041dc244bdd58858ba3abc4f3a4efd9f8dc7 SHA512 d7dd30bbc94ec014b12b37a106aa536dd5c8b16e9f1605b68cad6721cf6e3959add1f75a42693fd8499734ca19eb76f648800d7cc8081fe334282841cd406954 DIST scons-4.7.0-user.html 1683569 BLAKE2B 6c68f34af85fbfaf70f77758321bd0bb86b4f549c5fa05f721df94af0627d030a15db89565910ee6674b514d6b4fac9e624ac0aa6e849bd1224833c0473ed4c6 SHA512 8b0320794775890d898854767cd12bc4da725f6a33ae4496dc41a7b37a6dcb5f812c23083093d17685db9799b230552e19cc5550a108c2cf6787ffd963e649d6 DIST scons-4.7.0-user.pdf 3069908 BLAKE2B 7196a5b247802c9f42914c4de5968862c4a183e5c3ff7e5172ec7bbf58f049362f0b85fdaba47c66fc09dbed79c22ddac8195a78bff2e564eff879b0e6a4f482 SHA512 6d62def8a68c8bf3b6cc269a93272c815e82b46bd6a223d0f7f3848daf9c7212e5f9de8dcdac41d2a6f2d7d70053b97f92e0b99c11f4f5b2b3a69951d474fe3a DIST scons-4.7.0.gh.tar.gz 5896790 BLAKE2B 1ce9041ad1e2891da92a9bd50e07e29a5e23c7c9432adb120d6610956a2ea4a5125fb6bfa1f8b944797d589cfdbe036a1b9b1eae271ae51abb826c6ee5a3ee1c SHA512 8be4d611c375c13467a1a437e0d47873f973584d9a1be0d1cbbd345685a8f477fc19fa59ab01bca1ab7be8af0034d5cfda360090ee4b347c41f7bfea363bfe6c diff --git a/dev-build/scons/scons-4.6.0-r1.ebuild b/dev-build/scons/scons-4.6.0-r1.ebuild deleted file mode 100644 index 49a1a19a8b7d..000000000000 --- a/dev-build/scons/scons-4.6.0-r1.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 multiprocessing - -MY_P="SCons-${PV}" -DESCRIPTION="Extensible Python-based build utility" -HOMEPAGE=" - https://www.scons.org/ - https://github.com/SCons/scons/ - https://pypi.org/project/SCons/ -" -SRC_URI=" - https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz - doc? ( - https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf - -> ${P}-user.pdf - https://www.scons.org/doc/${PV}/HTML/${PN}-user.html - -> ${P}-user.html - ) - test? ( - https://github.com/SCons/scons/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz - ) -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - ) -" - -src_unpack() { - # use the git directory structure, then unpack the pypi tarball - # on top of it to make our life easier - if use test; then - unpack "${P}.gh.tar.gz" - else - mkdir -p "${P}" || die - fi - - tar -C "${P}" --strip-components=1 --no-same-owner \ - -xzf "${DISTDIR}/${MY_P}.tar.gz" || die -} - -src_prepare() { - distutils-r1_src_prepare - - # fixed in .post1 release - rm -r SCons/Tool/docbook/__pycache__ || die - - # TODO: rebase the patches <4.5.1-r2 is gone - # support env passthrough for Gentoo ebuilds - eapply -p2 "${FILESDIR}"/scons-4.1.0-env-passthrough.patch - # respect CC, CXX, C*FLAGS, LDFLAGS by default - eapply -p2 "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch - - if use test; then - local remove_tests=( - # TODO: does not respect PATH? - test/Clang - # broken - test/DVIPDF/DVIPDFFLAGS.py - test/Java/swig-dependencies.py - test/Java/multi-step.py - test/TEX/newglossary.py - test/TEX/variant_dir_newglossary.py - test/Configure/option--config.py - # broken by commas in date, sic! - test/option/option-v.py - test/Interactive/version.py - # warnings from new binutils? - test/AS/as-live.py - test/AS/nasm.py - # hangs - test/KeyboardInterrupt.py - # requires f77 executable - test/Fortran/F77PATH.py - test/Fortran/FORTRANPATH.py - test/Fortran/gfortran.py - # TODO, these seem to be caused by our patches - test/Repository/include.py - test/Repository/multi-dir.py - test/Repository/variants.py - test/virtualenv/activated/option/ignore-virtualenv.py - # broken by CC being set? *facepalm* - test/LINK/applelink.py - test/ToolSurrogate.py - # no clue but why would we care about rpm? - test/packaging/option--package-type.py - test/packaging/rpm/cleanup.py - test/packaging/rpm/internationalization.py - test/packaging/rpm/multipackage.py - test/packaging/rpm/package.py - test/packaging/rpm/tagging.py - # apparently fragile to... limits? - # https://bugs.gentoo.org/908347#c7 - test/builderrors.py - ) - - if ! use amd64 && ! use x86 ; then - # These tests are currently broken on arm and other non-amd64/x86 platforms - # Work seems to be ongoing in e.g. https://github.com/SCons/scons/pull/4022 to - # better plumb up the MSVC tests for alternative arches. - # Try again after 4.2.0. - # See also: https://pairlist4.pair.net/pipermail/scons-users/2020-November/008452.html - # bug #757534 - remove_tests+=( - test/MSVS/vs-7.0-scc-files.py - test/MSVS/vs-7.0-scc-legacy-files.py - test/MSVS/vs-7.1-scc-files.py - test/MSVS/vs-7.1-scc-legacy-files.py - test/MSVS/vs-scc-files.py - test/MSVS/vs-scc-legacy-files.py - ) - fi - - rm -r "${remove_tests[@]}" || die - fi -} - -python_test() { - local -x COLUMNS=80 - # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env - local -x GENTOO_SCONS_ENV_PASSTHROUGH=1 - # unset some env variables to pass appropriate tests - unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS - cd "${WORKDIR}/${P}" || die - "${EPYTHON}" runtest.py -a --passed \ - -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" - - # runtest.py script returns "0" if all tests are passed - # and returns "2" if there are any tests with "no result" - # (i.e. in case if some tools are not installed or it's Windows specific tests) - [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}" - - # sigh - rm "${BUILD_DIR}/install/usr/bin/.sconsign" || die -} - -python_install_all() { - rm "${ED}"/usr/*.1 || die - distutils-r1_python_install_all - - doman *.1 - use doc && dodoc "${DISTDIR}/${P}"-user.{pdf,html} -} diff --git a/dev-build/scons/scons-4.7.0.ebuild b/dev-build/scons/scons-4.7.0.ebuild index adc721c8bdcb..4b4b4161b6d5 100644 --- a/dev-build/scons/scons-4.7.0.ebuild +++ b/dev-build/scons/scons-4.7.0.ebuild @@ -32,7 +32,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz index df3292068b5d..b773c19fac7b 100644 Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest index 15ec5b166503..ab5d8910b384 100644 --- a/dev-cpp/cairomm/Manifest +++ b/dev-cpp/cairomm/Manifest @@ -1,3 +1,2 @@ DIST cairomm-1.14.4.tar.xz 618548 BLAKE2B 611e05b66e731d470c6d9a64c2eb4aee68aa73be5c05cb7e741e9a851ef15609cfc9fc27177531880b16517e62cf5c3f7669d4f7e7c5c78b9bc7d829e27f4d25 SHA512 9e2692837f55a2e66cd7e9d0a8033a35524df1c3186a53a9be75d71e899240dbc8959c914471e61e311812dabaf815e732142686b42fbdc75a71c05b41013d33 -DIST cairomm-1.16.2.tar.xz 593504 BLAKE2B 6682604f5907f16e40dd497f07eaaca5a4dc8a0b90771a0631406817ec397c42eb1784a6cbf15094ea6d61591acf04818e1b4d64ede3383b6859668d3b445a76 SHA512 61dc639eabe8502e1262c53c92fe57c5647e5ab9931f86ed51e657df1b7d0e3e58c2571910a05236cc0dca8d52f1f693aed99a553430f14d0fb87be1832a6b62 DIST cairomm-1.18.0.tar.xz 632520 BLAKE2B e05135eb2e22ed6002821567dd951644febc173b04e001f3574d6dac36d0c6d012c3806e7485fa7856402945934c653c4546855a8e97b016130edac31726d827 SHA512 d358a765136e244773b4a0fdcb2d9c81dd0b76f7a27c7108f94df9765f2d790f5f50b5645c09c292efce3e012528f85114d51916450c5fe6fa87d09f5a405d4c diff --git a/dev-cpp/cairomm/cairomm-1.16.2.ebuild b/dev-cpp/cairomm/cairomm-1.16.2.ebuild deleted file mode 100644 index e28126d37356..000000000000 --- a/dev-cpp/cairomm/cairomm-1.16.2.ebuild +++ /dev/null @@ -1,50 +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 meson-multilib python-any-r1 - -DESCRIPTION="C++ bindings for the Cairo vector graphics library" -HOMEPAGE="https://cairographics.org/cairomm/ https://gitlab.freedesktop.org/cairo/cairomm" -SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz" - -LICENSE="LGPL-2+" -SLOT="1.16" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="gtk-doc test X" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/libsigc++:3[gtk-doc?,${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.12.10[X=,${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( - dev-libs/boost[${MULTILIB_USEDEP}] - media-libs/fontconfig[${MULTILIB_USEDEP}] - ) -" -BDEPEND=" - virtual/pkgconfig - gtk-doc? ( - ${PYTHON_DEPS} - >=dev-cpp/mm-common-1.0.4 - app-text/doxygen[dot] - dev-libs/libxslt - ) -" - -pkg_setup() { - use gtk-doc && python-any-r1_pkg_setup -} - -multilib_src_configure() { - local emesonargs=( - $(meson_native_use_bool gtk-doc build-documentation) - -Dbuild-examples=false - $(meson_use test build-tests) - -Dboost-shared=true - ) - meson_src_configure -} diff --git a/dev-cpp/catch/catch-2.13.10.ebuild b/dev-cpp/catch/catch-2.13.10.ebuild index f71e87786c4c..78018fe27f69 100644 --- a/dev-cpp/catch/catch-2.13.10.ebuild +++ b/dev-cpp/catch/catch-2.13.10.ebuild @@ -15,7 +15,7 @@ else SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="Modern C++ header-only framework for unit-tests" diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.15.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.15.3.ebuild index 965e809a7b66..8e738097790f 100644 --- a/dev-cpp/cpp-httplib/cpp-httplib-0.15.3.ebuild +++ b/dev-cpp/cpp-httplib/cpp-httplib-0.15.3.ebuild @@ -18,7 +18,7 @@ else SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" fi LICENSE="MIT" diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest index 5399868cf1f3..781307ad8988 100644 --- a/dev-cpp/glibmm/Manifest +++ b/dev-cpp/glibmm/Manifest @@ -1,5 +1,2 @@ -DIST glibmm-2.66.6.tar.xz 8668828 BLAKE2B 0e133eb73f8a290e3bc2167435e9e88b49603153c96d2eff130ac0ee0d1b1e0d3907197267cd1bc62e1f8b6a74ed8a8429e891430c4bfc512cbdf5e877e79701 SHA512 64d5ee1904ac645ee5a470889b928a24ab012bb0c310a94631bd725df9d5b7a5c0d2129f114017677db922b724ad12ab33698f1d27cae4aaeccd199b0e883099 DIST glibmm-2.66.7.tar.xz 8773780 BLAKE2B faef7b6a9ca91aed3ac7ddeddc0413f87daba4b8d1e887431bd7db8b7cae66ec449292bbb0fb9e4e574d1ce680853ab0ffb476abd76c19257c7434389ba3d2cc SHA512 09b99622c051afd264d7a9b23025ee28ec870c6d23a5084ef7192f67b96fb8f16be5dbb2e8a4ff8a1d4ff873d3e73b4e25dee122049266687f471dcd3989b5bb -DIST glibmm-2.76.0.tar.xz 9295168 BLAKE2B 99e6e0776f945a245ea68ca39194c6cecaace282a9be31e27e65e07b8034963c814a6306b74817aeb82740fbc01a9e4ff3a0b4a8605da15a3cd0d3e72a86bb16 SHA512 be49599f5eb8eb5a1cef015cdb37af2564fcd1ea845aa4344804ca5f0f61468949711e25cefebb93219e1be37128ebfdd2a816324e752ac4395b4b87c072fc78 -DIST glibmm-2.78.0.tar.xz 9292916 BLAKE2B 41b0bf4d472b9ee1252f96c1d77a41b9ea447e4cf10b613fb1c3ca99251e0701923ab0a4efe305f0a04ae72f7fbd376d76d3e03df11ecc67343d6927068c42af SHA512 b93575983860101d793725e08c13987914465e4daf280defb4a96b2f842b9e1a99c9320b05f2a6af9e3f7a2a384855b6710b982f9015a6469e37f3c257d9d811 DIST glibmm-2.78.1.tar.xz 9486784 BLAKE2B 2875d93b0cedb6bf84cb463b1c73743c55dc446ee0c1dce36344a8e0ff77cec8d890d1e3b0f1d4a841d293ab123cc60bf5c6b55ed9a0456fe235d928bf28ff05 SHA512 5ace15c492be553e2c6abd8d0699197239261feaa2b45ff77181f59bb98b584dc822bdd46dbdee35691cc5a955a3b88e03f58532459236fd780823354c35d0a6 diff --git a/dev-cpp/glibmm/glibmm-2.66.6.ebuild b/dev-cpp/glibmm/glibmm-2.66.6.ebuild deleted file mode 100644 index 5132ce563e14..000000000000 --- a/dev-cpp/glibmm/glibmm-2.66.6.ebuild +++ /dev/null @@ -1,54 +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 gnome.org meson-multilib python-any-r1 - -DESCRIPTION="C++ interface for glib2" -HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm" - -LICENSE="LGPL-2.1+" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="gtk-doc debug test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.61.2:2[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - gtk-doc? ( - app-text/doxygen[dot] - dev-lang/perl - dev-perl/XML-Parser - dev-libs/libxslt - media-gfx/graphviz - ) -" - -src_prepare() { - default - - # giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep - sed -i -e '/giomm_tls_client/d' tests/meson.build || die - - if ! use test; then - sed -i -e "/^subdir('tests')/d" meson.build || die - fi -} - -multilib_src_configure() { - local emesonargs=( - -Dwarnings=min - -Dbuild-deprecated-api=true - $(meson_native_use_bool gtk-doc build-documentation) - $(meson_use debug debug-refcounting) - -Dbuild-examples=false - ) - meson_src_configure -} diff --git a/dev-cpp/glibmm/glibmm-2.76.0.ebuild b/dev-cpp/glibmm/glibmm-2.76.0.ebuild deleted file mode 100644 index e84aeae04dfd..000000000000 --- a/dev-cpp/glibmm/glibmm-2.76.0.ebuild +++ /dev/null @@ -1,52 +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 gnome.org meson-multilib python-any-r1 - -DESCRIPTION="C++ interface for glib2" -HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm" - -LICENSE="LGPL-2.1+" -SLOT="2.68" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="gtk-doc debug test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.73.2:2[${MULTILIB_USEDEP}] - dev-libs/libsigc++:3[gtk-doc?,${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - gtk-doc? ( - app-text/doxygen[dot] - dev-lang/perl - dev-libs/libxslt - ) -" - -src_prepare() { - default - - # giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep - sed -i -e '/giomm_tls_client/d' tests/meson.build || die - - if ! use test; then - sed -i -e "/^subdir('tests')/d" meson.build || die - fi -} - -multilib_src_configure() { - local emesonargs=( - -Dwarnings=min - -Dbuild-deprecated-api=true - $(meson_native_use_bool gtk-doc build-documentation) - $(meson_use debug debug-refcounting) - -Dbuild-examples=false - ) - meson_src_configure -} diff --git a/dev-cpp/glibmm/glibmm-2.78.0.ebuild b/dev-cpp/glibmm/glibmm-2.78.0.ebuild deleted file mode 100644 index 3e3b77f7ad82..000000000000 --- a/dev-cpp/glibmm/glibmm-2.78.0.ebuild +++ /dev/null @@ -1,52 +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 gnome.org meson-multilib python-any-r1 - -DESCRIPTION="C++ interface for glib2" -HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm" - -LICENSE="LGPL-2.1+" -SLOT="2.68" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="gtk-doc debug test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.77.0:2[${MULTILIB_USEDEP}] - dev-libs/libsigc++:3[gtk-doc?,${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - gtk-doc? ( - app-text/doxygen[dot] - dev-lang/perl - dev-libs/libxslt - ) -" - -src_prepare() { - default - - # giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep - sed -i -e '/giomm_tls_client/d' tests/meson.build || die - - if ! use test; then - sed -i -e "/^subdir('tests')/d" meson.build || die - fi -} - -multilib_src_configure() { - local emesonargs=( - -Dwarnings=min - -Dbuild-deprecated-api=true - $(meson_native_use_bool gtk-doc build-documentation) - $(meson_use debug debug-refcounting) - -Dbuild-examples=false - ) - meson_src_configure -} diff --git a/dev-cpp/mm-common/Manifest b/dev-cpp/mm-common/Manifest index a96d23566d81..0185f92429a6 100644 --- a/dev-cpp/mm-common/Manifest +++ b/dev-cpp/mm-common/Manifest @@ -1,2 +1 @@ -DIST mm-common-1.0.5.tar.xz 290608 BLAKE2B fcd698e8122fbcbcefcc6cce9460216cb3c3eabb17b309a28b964c9cd99b1329f936070f54b888cf0712e4590b8fe99394a110997ff023ff07dd7a30e55d771b SHA512 bf681b4d63d5bf531a9315b0c8841e3815af276828d1828a3eb04dcb805cbbfbaac182f79f5e48688a7eef8666975b9079144e320093e4ee3addff48813e61ad DIST mm-common-1.0.6.tar.xz 287832 BLAKE2B b633f37a470b558c16ce4a260384913ddc64df2ac94e25e2b7b05300c5c7b51826477bff655154572bd7eafe583b4cb056e7c9dee3d3e699dbf200490da0591f SHA512 2141ce9dabdae153e5708b09d30e7917182888e521ff0c2a4f85c7ec2dd86b2c8753e0513bf9c9f9a00d4e579173ffa859a3efd006e706fdfa2f33b0e77af48b diff --git a/dev-cpp/mm-common/mm-common-1.0.5.ebuild b/dev-cpp/mm-common/mm-common-1.0.5.ebuild deleted file mode 100644 index 59e4125e9a58..000000000000 --- a/dev-cpp/mm-common/mm-common-1.0.5.ebuild +++ /dev/null @@ -1,23 +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 gnome.org python-any-r1 meson - -DESCRIPTION="Build infrastructure and utilities for GNOME C++ bindings" -HOMEPAGE="https://www.gtkmm.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" - -BDEPEND="${PYTHON_DEPS}" - -src_prepare() { - default - - # Include project version in docdir name - sed -i -e "s:^install_docdir.*:& + '-' + meson.project_version():" meson.build || die -} diff --git a/dev-debug/Manifest.gz b/dev-debug/Manifest.gz index 9a0bd5fac454..f966f4e5eb56 100644 Binary files a/dev-debug/Manifest.gz and b/dev-debug/Manifest.gz differ diff --git a/dev-debug/d-spy/Manifest b/dev-debug/d-spy/Manifest index 511442806a43..124cc8dc61b1 100644 --- a/dev-debug/d-spy/Manifest +++ b/dev-debug/d-spy/Manifest @@ -1,2 +1 @@ -DIST d-spy-1.6.0.tar.xz 215844 BLAKE2B 4811591024d3b599e5e10354db8aa14d5b80bf6fb3c8bfbeadcf5d9c14501af0d00368643cb58eac5ad9452b541743ce3ff9f8376202270f635078876a1012b3 SHA512 7a65bd64320a69eb54077a359381bda35f285b42f4181bf972bc790a8002a773b66c23303e5e94c3dec8c7b9bfc7b8aa60a5ce60f2eb47459ce3dfd634a05703 DIST d-spy-1.8.0.tar.xz 232944 BLAKE2B cb6f90e9b3d779aa5a76bc93f16e9ae677af029b72451bbb983ffeb06b99a92aa2402ef8b6f6a6c6b4ad4f6ba49a924db37d7e9fc9cb98157a6475a0ec234267 SHA512 49c0ff250a91110014f98453ed6958cf4b5191cc0c8d31c5e63b1408864eaf0906ab3860b0479400a04a8614ee36fe5b9527b179e6346bdb5616cb188d2648f0 diff --git a/dev-debug/d-spy/d-spy-1.6.0.ebuild b/dev-debug/d-spy/d-spy-1.6.0.ebuild deleted file mode 100644 index a3ef33127ea0..000000000000 --- a/dev-debug/d-spy/d-spy-1.6.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org meson xdg - -DESCRIPTION="D-spy is a blisteringly fast D-Bus debugger" -HOMEPAGE="https://gitlab.gnome.org/GNOME/d-spy" - -LICENSE="GPL-3+ LGPL-3+" -SLOT="1" -KEYWORDS="amd64" - -DEPEND=" - >=dev-libs/glib-2.68:2 - >=gui-libs/gtk-4.6:4 - >=gui-libs/libadwaita-1.0:1 -" -RDEPEND=" - ${DEPEND} - >=sys-apps/dbus-1 -" -BDEPEND=" - dev-libs/appstream-glib - dev-util/desktop-file-utils - sys-devel/gettext - virtual/pkgconfig -" - -src_install() { - meson_src_install -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/dev-debug/duma/duma-2.5.15-r3.ebuild b/dev-debug/duma/duma-2.5.15-r3.ebuild new file mode 100644 index 000000000000..829ceeeaf79f --- /dev/null +++ b/dev-debug/duma/duma-2.5.15-r3.ebuild @@ -0,0 +1,85 @@ +# 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="DUMA (Detect Unintended Memory Access) is a memory debugging library" +HOMEPAGE="http://duma.sourceforge.net" +SRC_URI="mirror://sourceforge/duma/${P//[.-]/_}.tar.gz + mirror://gentoo/${P}-GNUmakefile.patch.bz2" +S=${WORKDIR}/${P//[.-]/_} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="examples" + +PATCHES=( + "${WORKDIR}"/${P}-GNUmakefile.patch + "${FILESDIR}"/${P}-gcc6.patch +) + +src_configure() { + # other flags will break duma + export CFLAGS="-O0 -Wall -Wextra -U_FORTIFY_SOURCE" + tc-export AR CC CXX LD RANLIB + + # bug #789708 + append-cxxflags -std=c++14 + + case "${CHOST}" in + *-linux-gnu) + OS=linux;; + *-solaris*) + OS=solaris;; + *-darwin*) + OS=osx;; + esac + export OS="${OS}" + elog "Detected OS is: ${OS}" + + if use amd64 && [[ -z "${DUMA_ALIGNMENT}" ]]; then + export DUMA_ALIGNMENT=16 + elog "Exported DUMA_ALIGNMENT=${DUMA_ALIGNMENT} for x86_64," + fi +} + +src_compile() { + # The below must be run first if distcc is enabled, otherwise + # the real build breaks on parallel makes. + emake reconfig + emake +} + +src_test() { + emake test + + elog "Please, see the output above to verify all tests have passed." + elog "Both static and dynamic confidence tests should say PASSED." +} + +src_install() { + emake prefix="${ED}/usr" libdir="${ED}/usr/$(get_libdir)" \ + docdir="${ED}/usr/share/doc/${PF}" install + + sed -i "s|LD_PRELOAD=./libduma|LD_PRELOAD=libduma|" "${D}"/usr/bin/duma \ + || die "sed failed" + + dodoc CHANGELOG TODO GNUmakefile + + if use examples; then + docinto examples + dodoc example[1-6].cpp example_makes/ex6/Makefile + fi +} + +pkg_postinst() { + elog "See the GNUmakefile which will be also installed at" + elog "/usr/share/doc/${PF} for more options. You can now export" + elog "varibles to the build system easily, e.g.:" + elog "# export CPPFLAGS=\"-DFLAG\" (or by using append-cppflags)" + elog "# export DUMA_ALIGNMENT=${DUMA_ALIGNMENT} (Default is 16 for x86_64)" + elog "See more information about DUMA_ALIGNMENT from Readme.txt" +} diff --git a/dev-debug/strace/strace-6.7.ebuild b/dev-debug/strace/strace-6.7.ebuild index 2ba8f3e59a05..482af8b00c17 100644 --- a/dev-debug/strace/strace-6.7.ebuild +++ b/dev-debug/strace/strace-6.7.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi LICENSE="LGPL-2.1+ test? ( GPL-2+ )" diff --git a/dev-dotnet/Manifest.gz b/dev-dotnet/Manifest.gz index 9a3077e86d88..c6a7cbcc2683 100644 Binary files a/dev-dotnet/Manifest.gz and b/dev-dotnet/Manifest.gz differ diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.201.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.201.ebuild index 38929dc875b5..bb8367b4925d 100644 --- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.201.ebuild +++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.201.ebuild @@ -27,7 +27,7 @@ S="${WORKDIR}" LICENSE="MIT" SLOT="${SDK_SLOT}/${RUNTIME_SLOT}" -KEYWORDS="~amd64 ~arm ~arm64" +KEYWORDS="amd64 arm arm64" # STRIP="llvm-strip" corrupts some executables when using the patchelf hack, # bug https://bugs.gentoo.org/923430 diff --git a/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.102.ebuild b/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.102.ebuild index 6eea4fc79aef..49051dc868f3 100644 --- a/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.102.ebuild +++ b/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.102.ebuild @@ -41,7 +41,7 @@ S="${WORKDIR}/${PN}-${RUNTIME_SLOT}" LICENSE="MIT" SLOT="${SDK_SLOT}/${RUNTIME_SLOT}" -KEYWORDS="~amd64" +KEYWORDS="amd64" # STRIP="llvm-strip" corrupts some executables when using the patchelf hack. # Be safe and restrict it for source-built too, bug https://bugs.gentoo.org/923430 diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz index 43542702d6fe..43916e04a8bf 100644 Binary files a/dev-erlang/Manifest.gz and b/dev-erlang/Manifest.gz differ diff --git a/dev-erlang/fast_tls/fast_tls-1.1.19.ebuild b/dev-erlang/fast_tls/fast_tls-1.1.19.ebuild index 465f08ffd058..c0ea4b4e28d5 100644 --- a/dev-erlang/fast_tls/fast_tls-1.1.19.ebuild +++ b/dev-erlang/fast_tls/fast_tls-1.1.19.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86" DEPEND=" >=dev-erlang/p1_utils-1.0.25 diff --git a/dev-erlang/p1_mysql/p1_mysql-1.0.23.ebuild b/dev-erlang/p1_mysql/p1_mysql-1.0.23.ebuild index 4026ad327856..44865464f1c8 100644 --- a/dev-erlang/p1_mysql/p1_mysql-1.0.23.ebuild +++ b/dev-erlang/p1_mysql/p1_mysql-1.0.23.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86" DEPEND=">=dev-lang/erlang-17.1" RDEPEND="${DEPEND}" diff --git a/dev-erlang/p1_pgsql/p1_pgsql-1.1.25.ebuild b/dev-erlang/p1_pgsql/p1_pgsql-1.1.25.ebuild index 20e1310ee478..c8a9d525901f 100644 --- a/dev-erlang/p1_pgsql/p1_pgsql-1.1.25.ebuild +++ b/dev-erlang/p1_pgsql/p1_pgsql-1.1.25.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="ErlPL-1.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86" DEPEND=" >=dev-erlang/xmpp-1.8.1 diff --git a/dev-erlang/stun/stun-1.2.12.ebuild b/dev-erlang/stun/stun-1.2.12.ebuild index 77984ef4ad55..1f03cc1488ab 100644 --- a/dev-erlang/stun/stun-1.2.12.ebuild +++ b/dev-erlang/stun/stun-1.2.12.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86" DEPEND=" >=dev-erlang/fast_tls-1.1.19 diff --git a/dev-erlang/xmpp/xmpp-1.8.1.ebuild b/dev-erlang/xmpp/xmpp-1.8.1.ebuild index 725ba13837bd..d0590a4ab222 100644 --- a/dev-erlang/xmpp/xmpp-1.8.1.ebuild +++ b/dev-erlang/xmpp/xmpp-1.8.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86" RDEPEND=" >=dev-erlang/ezlib-1.0.12 diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz index 33941219f531..be219b3cbea2 100644 Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ diff --git a/dev-games/aseprite/aseprite-1.2.40.ebuild b/dev-games/aseprite/aseprite-1.2.40.ebuild index db187de2e8df..2a603fddfb1f 100644 --- a/dev-games/aseprite/aseprite-1.2.40.ebuild +++ b/dev-games/aseprite/aseprite-1.2.40.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake desktop ninja-utils python-any-r1 toolchain-funcs xdg-utils +inherit cmake desktop flag-o-matic ninja-utils python-any-r1 toolchain-funcs xdg-utils SKIA_VER="m102" # Last commit in ${SKIA_VER} feature branch @@ -96,6 +96,19 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing, -Werror=odr, -Werror=lto-type-mismatch + # https://bugs.gentoo.org/924692 + # https://github.com/aseprite/aseprite/issues/4413 + # + # There is a bundled skia that fails with ODR errors. When excluding just + # skia from testing, aseprite itself fails with strict-aliasing, and when + # that is disabled, fails again with ODR and lto-type-mismatch issues. + # + # There are a lot of issues, so don't trust any fixes without thorough + # testing. + append-flags -fno-strict-aliasing + filter-lto + einfo "Skia configuration" cd "${WORKDIR}/skia-${SKIA_REV}" || die diff --git a/dev-games/aseprite/aseprite-1.3.2.ebuild b/dev-games/aseprite/aseprite-1.3.2.ebuild index a5dfeae7a147..7630df8d90a4 100644 --- a/dev-games/aseprite/aseprite-1.3.2.ebuild +++ b/dev-games/aseprite/aseprite-1.3.2.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake desktop python-any-r1 toolchain-funcs xdg-utils +inherit cmake desktop flag-o-matic python-any-r1 toolchain-funcs xdg-utils SKIA_VER="m102" # Last commit in ${SKIA_VER} feature branch @@ -96,6 +96,19 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing, -Werror=odr, -Werror=lto-type-mismatch + # https://bugs.gentoo.org/924692 + # https://github.com/aseprite/aseprite/issues/4413 + # + # There is a bundled skia that fails with ODR errors. When excluding just + # skia from testing, aseprite itself fails with strict-aliasing, and when + # that is disabled, fails again with ODR and lto-type-mismatch issues. + # + # There are a lot of issues, so don't trust any fixes without thorough + # testing. + append-flags -fno-strict-aliasing + filter-lto + einfo "Skia configuration" cd "${WORKDIR}/skia-${SKIA_REV}" || die diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 85b8110eba92..08e5939c93bd 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/ant-antlr/Manifest b/dev-java/ant-antlr/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-antlr/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild b/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild deleted file mode 100644 index 3d1f5f5f4ac0..000000000000 --- a/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="" - -inherit ant-tasks - -DESCRIPTION="Apache Ant's optional tasks for Antlr" -KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -RDEPEND=">=dev-java/antlr-2.7.7-r7:0" - -src_install() { - ant-tasks_src_install - java-pkg_register-dependency antlr -} diff --git a/dev-java/ant-antlr/metadata.xml b/dev-java/ant-antlr/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-antlr/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-apache-bcel/Manifest b/dev-java/ant-apache-bcel/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-apache-bcel/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild deleted file mode 100644 index 19fd7d66d46e..000000000000 --- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="bcel" - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=dev-java/bcel-5.1-r3:0" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-apache-bcel/metadata.xml b/dev-java/ant-apache-bcel/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-apache-bcel/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-apache-bsf/Manifest b/dev-java/ant-apache-bsf/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-apache-bsf/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9-r1.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9-r1.ebuild deleted file mode 100644 index 04cdcf48579c..000000000000 --- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="bsf-2.3" - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="python javascript tcl" - -DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[javascript?,tcl?]" -RDEPEND="${DEPEND}" - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "Also, >=dev-java/bsf-2.4.0-r1 adds optional support for groovy," - elog "ruby and beanshell. See its postinst elog messages for instructions." - fi -} diff --git a/dev-java/ant-apache-bsf/metadata.xml b/dev-java/ant-apache-bsf/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-apache-bsf/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-apache-log4j/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild deleted file mode 100644 index b7f808b7f60d..000000000000 --- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="log4j-12-api-2" - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND="dev-java/log4j-12-api:2" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-apache-log4j/metadata.xml b/dev-java/ant-apache-log4j/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-apache-log4j/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-apache-oro/Manifest b/dev-java/ant-apache-oro/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-apache-oro/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild deleted file mode 100644 index 4fa3ab36eac0..000000000000 --- a/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="jakarta-oro-2.0" - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-apache-oro/metadata.xml b/dev-java/ant-apache-oro/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-apache-oro/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-apache-regexp/Manifest b/dev-java/ant-apache-regexp/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-apache-regexp/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild deleted file mode 100644 index 07ce567a85e6..000000000000 --- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="jakarta-regexp-1.4" - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-apache-regexp/metadata.xml b/dev-java/ant-apache-regexp/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-apache-regexp/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-apache-resolver/Manifest b/dev-java/ant-apache-resolver/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-apache-resolver/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild deleted file mode 100644 index 77c663e553ce..000000000000 --- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="xml-commons-resolver" - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=dev-java/xml-commons-resolver-1.2:0" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-apache-resolver/metadata.xml b/dev-java/ant-apache-resolver/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-apache-resolver/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-apache-xalan2/Manifest b/dev-java/ant-apache-xalan2/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-apache-xalan2/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild deleted file mode 100644 index a46ac087c870..000000000000 --- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="xalan" - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND="dev-java/xalan:0 - dev-java/xalan-serializer:0" - -RDEPEND="${DEPEND}" - -src_unpack() { - ant-tasks_src_unpack all - java-pkg_jar-from xalan-serializer -} diff --git a/dev-java/ant-apache-xalan2/metadata.xml b/dev-java/ant-apache-xalan2/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-apache-xalan2/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-commons-logging/Manifest b/dev-java/ant-commons-logging/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-commons-logging/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild deleted file mode 100644 index ce6a50054a6c..000000000000 --- a/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=dev-java/commons-logging-1.0.4-r2:0" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-commons-logging/metadata.xml b/dev-java/ant-commons-logging/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-commons-logging/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-commons-net/Manifest b/dev-java/ant-commons-net/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-commons-net/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild deleted file mode 100644 index 1ba1262c90f3..000000000000 --- a/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=dev-java/commons-net-1.4.1-r1:0" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-commons-net/metadata.xml b/dev-java/ant-commons-net/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-commons-net/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest deleted file mode 100644 index aa67f4731d80..000000000000 --- a/dev-java/ant-eclipse-ecj/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d -DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild deleted file mode 100644 index 86295bc01b6a..000000000000 --- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple prefix - -DMF="R-${PV}-202003050155" - -DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler" -HOMEPAGE="https://www.eclipse.org/" -SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar" - -LICENSE="EPL-1.0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" -SLOT="4.15" -IUSE="" - -CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT} - dev-java/ant-core:0" -RDEPEND="${CDEPEND} - >=virtual/jre-11:*" -DEPEND="${CDEPEND} - >=virtual/jdk-11:*" -BDEPEND="app-arch/unzip" - -JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}" - -src_prepare() { - default - - # Remove everything but the Ant component. - find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die - - rm build.xml || die -} - -src_compile() { - java-pkg-simple_src_compile - find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed" -} - -src_install() { - java-pkg-simple_src_install - insinto /usr/share/java-config-2/compiler - doins "${FILESDIR}/ecj-${SLOT}" - eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT} -} diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild deleted file mode 100644 index 478ef5996a68..000000000000 --- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple prefix - -DMF="R-${PV}-202211231800" - -DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler" -HOMEPAGE="https://www.eclipse.org/" -SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar" - -LICENSE="EPL-1.0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" -SLOT="4.26" -IUSE="" - -CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT} - dev-java/ant-core:0" -# though technically both could be set to 1.8 and it would -# compile using jdk 11+, it would not compile using jdk 1.8 -# because eclipse ecj has min jdk 11 -RDEPEND="${CDEPEND} - >=virtual/jre-11:*" -DEPEND="${CDEPEND} - >=virtual/jdk-17:*" -BDEPEND="app-arch/unzip" - -JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}" - -src_prepare() { - default - - # Remove everything but the Ant component. - find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die - - rm build.xml || die -} - -src_compile() { - java-pkg-simple_src_compile - find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed" -} - -src_install() { - java-pkg-simple_src_install - insinto /usr/share/java-config-2/compiler - doins "${FILESDIR}/ecj-${SLOT}" - eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT} -} diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.15 b/dev-java/ant-eclipse-ecj/files/ecj-4.15 deleted file mode 100644 index f943dedcc19b..000000000000 --- a/dev-java/ant-eclipse-ecj/files/ecj-4.15 +++ /dev/null @@ -1,7 +0,0 @@ -JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.15" -PACKAGE="=dev-java/ant-eclipse-ecj-4.15*" -SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13" -SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13" -ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" -ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.15,ant-eclipse-ecj-4.15" -GENERATION="2" diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.26 b/dev-java/ant-eclipse-ecj/files/ecj-4.26 deleted file mode 100644 index 950088453264..000000000000 --- a/dev-java/ant-eclipse-ecj/files/ecj-4.26 +++ /dev/null @@ -1,7 +0,0 @@ -JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.25" -PACKAGE="=dev-java/ant-eclipse-ecj-4.25*" -SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19" -SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19" -ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" -ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.26,ant-eclipse-ecj-4.26" -GENERATION="2" diff --git a/dev-java/ant-eclipse-ecj/metadata.xml b/dev-java/ant-eclipse-ecj/metadata.xml deleted file mode 100644 index 2c9857d120ad..000000000000 --- a/dev-java/ant-eclipse-ecj/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - java@gentoo.org - Java - - -ECJ is the Eclipse Compiler for Java. It's a separate packaging of -the embedded Java compiler that comes with Eclipse. It can be used -as a batch-compiler by running the ecj-3.1 script, or it can be -used with Ant by using the -lib option to and and setting --Dbuild.compiler=ecj - - diff --git a/dev-java/ant-jai/Manifest b/dev-java/ant-jai/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-jai/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-jai/ant-jai-1.10.9.ebuild b/dev-java/ant-jai/ant-jai-1.10.9.ebuild deleted file mode 100644 index 3a2873b650bb..000000000000 --- a/dev-java/ant-jai/ant-jai-1.10.9.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="sun-jai-bin" - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86" - -# Unmigrated, has textrels and there's also some source one now too. -DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-jai/metadata.xml b/dev-java/ant-jai/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-jai/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-javamail/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild deleted file mode 100644 index c02f16c20d31..000000000000 --- a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME=( "gnu-jaf-1" "javax-mail" ) - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -# needs some classes from javax.activation.* which are not in jdk 11 -DEPEND="virtual/jdk:1.8 - dev-java/gnu-jaf:1 - dev-java/javax-mail:0" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-javamail/metadata.xml b/dev-java/ant-javamail/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-javamail/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-jdepend/Manifest b/dev-java/ant-jdepend/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-jdepend/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild deleted file mode 100644 index 97d0329f5756..000000000000 --- a/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=dev-java/jdepend-2.9-r2:0" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-jdepend/metadata.xml b/dev-java/ant-jdepend/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-jdepend/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-jmf/Manifest b/dev-java/ant-jmf/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-jmf/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild b/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild deleted file mode 100644 index 76a06ae0e5a0..000000000000 --- a/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -# Seems we don't need to depend on jmf-bin, the classes ant imports are in J2SE -# API since version 1.3. -ANT_TASK_DEPNAME="" - -inherit ant-tasks - -DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)" - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" diff --git a/dev-java/ant-jmf/metadata.xml b/dev-java/ant-jmf/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-jmf/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-jsch/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild b/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild deleted file mode 100644 index 43d214487023..000000000000 --- a/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=dev-java/jsch-0.1.37:0" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-jsch/metadata.xml b/dev-java/ant-jsch/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-jsch/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-junit/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-junit/ant-junit-1.10.9.ebuild b/dev-java/ant-junit/ant-junit-1.10.9.ebuild deleted file mode 100644 index cea7fdca5bc1..000000000000 --- a/dev-java/ant-junit/ant-junit-1.10.9.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 - -inherit ant-tasks - -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=" - dev-java/junit:0 - dev-java/junit:4 -" -RDEPEND="${DEPEND}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="junit-4" - -src_compile() { - eant jar-junit -} diff --git a/dev-java/ant-junit/metadata.xml b/dev-java/ant-junit/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-junit/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-junit4/Manifest b/dev-java/ant-junit4/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-junit4/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild b/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild deleted file mode 100644 index 9eef99a67149..000000000000 --- a/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="junit-4" - -inherit ant-tasks - -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND="dev-java/junit:4 - ~dev-java/ant-junit-${PV}" - -RDEPEND="${DEPEND}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="junit-4,ant-junit" - -src_prepare() { - default - - java-pkg_jar-from --build-only --into "${S}/lib" ant-junit -} - -src_install() { - # No registration as ant-task, would be loaded together with ant-junit. - java-pkg_dojar build/lib/ant-junit4.jar - - # As we dont't want to depend on and-junit in package.env, because it depends - # on junit:0. Instead, we "steal" its jar and record it to our package.env as - # if it belongs to this package's classpath. - java-pkg_getjar --build-only ant-junit ant-junit.jar - java-pkg_regjar $(java-pkg_getjar --build-only ant-junit ant-junit.jar) -} diff --git a/dev-java/ant-junit4/metadata.xml b/dev-java/ant-junit4/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-junit4/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-junitlauncher/Manifest b/dev-java/ant-junitlauncher/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-junitlauncher/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild deleted file mode 100644 index 2b8d03f2e629..000000000000 --- a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="" - -inherit ant-tasks - -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" diff --git a/dev-java/ant-junitlauncher/metadata.xml b/dev-java/ant-junitlauncher/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-junitlauncher/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-swing/Manifest b/dev-java/ant-swing/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-swing/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-swing/ant-swing-1.10.9.ebuild b/dev-java/ant-swing/ant-swing-1.10.9.ebuild deleted file mode 100644 index c8dfb08b3aa2..000000000000 --- a/dev-java/ant-swing/ant-swing-1.10.9.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -# No extra dependencies are needed. -ANT_TASK_DEPNAME="" - -inherit ant-tasks - -DESCRIPTION="Apache Ant's optional tasks for Swing" - -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" diff --git a/dev-java/ant-swing/metadata.xml b/dev-java/ant-swing/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-swing/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-testutil/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild deleted file mode 100644 index 1f1b85e2d3ba..000000000000 --- a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 - -inherit ant-tasks - -DESCRIPTION="Apache Ant's optional test utility classes" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" - -CDEPEND="dev-java/ant-core:0" - -DEPEND="${CDEPEND} - >=virtual/jdk-1.8 - >=dev-java/junit-4.11:4 - ~dev-java/ant-swing-${PV} - ~dev-java/ant-junit4-${PV} - ~dev-java/ant-junitlauncher-${PV}" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.8" - -# The build system builds much more than it actually packages, so there are many -# build-only deps, but since those are quite common, it wasn't worth to patch it. - -src_unpack() { - ant-tasks_src_unpack base - java-pkg_jar-from --build-only junit-4,ant-junit4,ant-junitlauncher,ant-swing - java-pkg_jar-from --build-only ant-core ant-launcher.jar -} - -src_compile() { - eant test-jar -} diff --git a/dev-java/ant-testutil/metadata.xml b/dev-java/ant-testutil/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-testutil/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/ant-xz/Manifest b/dev-java/ant-xz/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-xz/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-xz/ant-xz-1.10.9.ebuild b/dev-java/ant-xz/ant-xz-1.10.9.ebuild deleted file mode 100644 index a7d47300d608..000000000000 --- a/dev-java/ant-xz/ant-xz-1.10.9.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="xz-java" - -inherit ant-tasks - -DESCRIPTION="Apache Ant's optional tasks for XZ compression" - -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND="dev-java/xz-java" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-xz/metadata.xml b/dev-java/ant-xz/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-xz/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild b/dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild new file mode 100644 index 000000000000..2891b009c53f --- /dev/null +++ b/dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Artifact ID for antlr-tool is 'antlr4' +# https://github.com/antlr/antlr4/blob/4.9.3/tool/pom.xml#L14 +MAVEN_ID="org.antlr:antlr4:4.9.3" + +JAVA_PKG_IUSE="doc source test" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +MY_PN="${PN%-tool}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="The ANTLR 4 grammar compiler" +HOMEPAGE="https://www.antlr.org/" +# Maven Central sources JAR for tool/src/org/antlr/v4/unicode/UnicodeData.java, +# which requires string-template-maven-plugin to generate; tarball for the rest +SRC_URI=" + https://github.com/antlr/antlr4/archive/${PV}.tar.gz -> ${MY_P}.tar.gz + https://repo1.maven.org/maven2/org/antlr/antlr4/${PV}/antlr4-${PV}-sources.jar -> ${P}-sources.jar +" + +LICENSE="BSD" +SLOT="4" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +CP_DEPEND=" + ~dev-java/antlr-runtime-${PV}:${SLOT} + dev-java/antlr-runtime:3.5 + dev-java/jakarta-json-api:1 + >=dev-java/icu4j-74.2-r1:0 + dev-java/stringtemplate:4 + dev-java/treelayout:0 +" + +DEPEND=" + >=virtual/jdk-1.8:* + ${CP_DEPEND} + dev-java/antlr-tool:3.5 + test? ( + dev-java/jol-core:0 + ) +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CP_DEPEND} +" + +S="${WORKDIR}/${MY_PN}4-${PV}" + +JAVA_SRC_DIR=( + tool/src + ../src/org # For UnicodeData.java +) +JAVA_RESOURCE_DIRS=( tool/resources ) + +JAVA_TEST_GENTOO_CLASSPATH="junit-4,jol-core" +JAVA_TEST_SRC_DIR=( + tool-testsuite/test + # The runtime test suite is used as a library for tool test suite + runtime-testsuite/{annotations,test} +) +JAVA_TEST_RESOURCE_DIRS=( + # Some resources are mixed with test source files + "${JAVA_TEST_SRC_DIR[0]}" +) + +pkg_setup() { + java-pkg-2_pkg_setup + MY_JAVA="$(java-config -J)" +} + +src_prepare() { + java-pkg_clean + eapply "${FILESDIR}/${PV}-test-fixes.patch" + java-pkg-2_src_prepare +} + +src_compile() { + einfo "Generating ANTLR 3 parsers" + "${MY_JAVA}" -cp "$(java-pkg_getjars \ + --build-only --with-dependencies antlr-tool-3.5)" \ + org.antlr.Tool $(find "${JAVA_SRC_DIR[@]}" -name "*.g") || + die "Failed to generate ANTLR 3 parsers" + java-pkg-simple_src_compile +} + +src_test() { + # Build classpath for tests + local test_deps=( + "${JAVA_TEST_GENTOO_CLASSPATH}" + antlr-runtime-${SLOT} + antlr-runtime-3.5 + jakarta-json-api-1 + icu4j + stringtemplate-4 + treelayout + ) + local CP="${S}/${JAVA_JAR_FILENAME}" + for test_dep in "${test_deps[@]}"; do + CP+=":$(java-pkg_getjars --with-dependencies "${test_dep}")" + done + for res_dir in "${JAVA_TEST_RESOURCE_DIRS[@]}"; do + CP+=":${res_dir}" + done + + einfo "Generating ANTLR 4 parsers for tests" + pushd runtime-testsuite/test > /dev/null || + die "Failed to enter runtime test source directory" + g4_files=( $(find * -name "*.g4") ) + for file in "${g4_files[@]}"; do + java_pkg="${file%/*.g4}" + java_pkg="${java_pkg//\//.}" + "${MY_JAVA}" -cp "${CP}" org.antlr.v4.Tool \ + -visitor -package "${java_pkg}" "${file}" || + die "Failed to generate ANTLR 4 parser from ${file}" + done + popd > /dev/null || die "Failed to leave runtime test source directory" + + # Compile Java test sources + local classes="target/classes" + ejavac -d "${classes}" -cp "${CP}" \ + $(find "${JAVA_TEST_SRC_DIR[@]}" -name "*.java") + + # Create a list of tests to run + pushd "${JAVA_TEST_SRC_DIR[0]}" > /dev/null || + die "Failed to enter test source directory for ${PN}" + local TESTS=$(find * -type f \ + \( -name "Test*.java" -o -name "*Test.java" \) \ + -not -name "BaseJavaToolTest.java" # No runnable methods + ) + TESTS="${TESTS//.java}" + TESTS="${TESTS//\//.}" + popd > /dev/null || die "Failed to leave test source directory for ${PN}" + + ejunit4 -classpath "${classes}:${CP}" ${TESTS} +} diff --git a/dev-java/antlr-tool/antlr-tool-4.9.3.ebuild b/dev-java/antlr-tool/antlr-tool-4.9.3.ebuild deleted file mode 100644 index 3461968d2cae..000000000000 --- a/dev-java/antlr-tool/antlr-tool-4.9.3.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Artifact ID for antlr-tool is 'antlr4' -# https://github.com/antlr/antlr4/blob/4.9.3/tool/pom.xml#L14 -MAVEN_ID="org.antlr:antlr4:4.9.3" - -JAVA_PKG_IUSE="doc source test" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -MY_PN="${PN%-tool}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="The ANTLR 4 grammar compiler" -HOMEPAGE="https://www.antlr.org/" -# Maven Central sources JAR for tool/src/org/antlr/v4/unicode/UnicodeData.java, -# which requires string-template-maven-plugin to generate; tarball for the rest -SRC_URI=" - https://github.com/antlr/antlr4/archive/${PV}.tar.gz -> ${MY_P}.tar.gz - https://repo1.maven.org/maven2/org/antlr/antlr4/${PV}/antlr4-${PV}-sources.jar -> ${P}-sources.jar -" - -LICENSE="BSD" -SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -CP_DEPEND=" - ~dev-java/antlr-runtime-${PV}:${SLOT} - dev-java/antlr-runtime:3.5 - dev-java/jakarta-json-api:1 - dev-java/icu4j:70 - dev-java/stringtemplate:4 - dev-java/treelayout:0 -" - -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND} - dev-java/antlr-tool:3.5 - test? ( - dev-java/jol-core:0 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND} -" - -S="${WORKDIR}/${MY_PN}4-${PV}" - -JAVA_SRC_DIR=( - tool/src - ../src/org # For UnicodeData.java -) -JAVA_RESOURCE_DIRS=( tool/resources ) - -JAVA_TEST_GENTOO_CLASSPATH="junit-4,jol-core" -JAVA_TEST_SRC_DIR=( - tool-testsuite/test - # The runtime test suite is used as a library for tool test suite - runtime-testsuite/{annotations,test} -) -JAVA_TEST_RESOURCE_DIRS=( - # Some resources are mixed with test source files - "${JAVA_TEST_SRC_DIR[0]}" -) - -pkg_setup() { - java-pkg-2_pkg_setup - MY_JAVA="$(java-config -J)" -} - -src_prepare() { - java-pkg_clean - eapply "${FILESDIR}/${PV}-test-fixes.patch" - java-pkg-2_src_prepare -} - -src_compile() { - einfo "Generating ANTLR 3 parsers" - "${MY_JAVA}" -cp "$(java-pkg_getjars \ - --build-only --with-dependencies antlr-tool-3.5)" \ - org.antlr.Tool $(find "${JAVA_SRC_DIR[@]}" -name "*.g") || - die "Failed to generate ANTLR 3 parsers" - java-pkg-simple_src_compile -} - -src_test() { - # Build classpath for tests - local test_deps=( - "${JAVA_TEST_GENTOO_CLASSPATH}" - antlr-runtime-${SLOT} - antlr-runtime-3.5 - jakarta-json-api-1 - icu4j-70 - stringtemplate-4 - treelayout - ) - local CP="${S}/${JAVA_JAR_FILENAME}" - for test_dep in "${test_deps[@]}"; do - CP+=":$(java-pkg_getjars --with-dependencies "${test_dep}")" - done - for res_dir in "${JAVA_TEST_RESOURCE_DIRS[@]}"; do - CP+=":${res_dir}" - done - - einfo "Generating ANTLR 4 parsers for tests" - pushd runtime-testsuite/test > /dev/null || - die "Failed to enter runtime test source directory" - g4_files=( $(find * -name "*.g4") ) - for file in "${g4_files[@]}"; do - java_pkg="${file%/*.g4}" - java_pkg="${java_pkg//\//.}" - "${MY_JAVA}" -cp "${CP}" org.antlr.v4.Tool \ - -visitor -package "${java_pkg}" "${file}" || - die "Failed to generate ANTLR 4 parser from ${file}" - done - popd > /dev/null || die "Failed to leave runtime test source directory" - - # Compile Java test sources - local classes="target/classes" - ejavac -d "${classes}" -cp "${CP}" \ - $(find "${JAVA_TEST_SRC_DIR[@]}" -name "*.java") - - # Create a list of tests to run - pushd "${JAVA_TEST_SRC_DIR[0]}" > /dev/null || - die "Failed to enter test source directory for ${PN}" - local TESTS=$(find * -type f \ - \( -name "Test*.java" -o -name "*Test.java" \) \ - -not -name "BaseJavaToolTest.java" # No runnable methods - ) - TESTS="${TESTS//.java}" - TESTS="${TESTS//\//.}" - popd > /dev/null || die "Failed to leave test source directory for ${PN}" - - ejunit4 -classpath "${classes}:${CP}" ${TESTS} -} diff --git a/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild b/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild index 0ae78daf656a..59f4e19a87db 100644 --- a/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild +++ b/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.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 @@ S="${WORKDIR}/auto-auto-service-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm ~arm64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/caffeine/caffeine-2.6.2-r1.ebuild b/dev-java/caffeine/caffeine-2.6.2-r1.ebuild new file mode 100644 index 000000000000..673e2da08617 --- /dev/null +++ b/dev-java/caffeine/caffeine-2.6.2-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="com.github.ben-manes.caffeine:caffeine:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A high performance caching library" +HOMEPAGE="https://github.com/ben-manes/caffeine" +SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/${PV}/caffeine-${PV}-sources.jar" +# Compiling from Github tarball would require to be packaged at least +# package com.squareup.javapoet +# package MethodSpec +# package TypeSpec +# SRC_URI="https://github.com/ben-manes/caffeine/archive/v${PV}.tar.gz -> ${P}.tar.gz" +# S="${WORKDIR}/${P}/caffeine" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ppc64 x86" + +BDEPEND="app-arch/unzip" +CP_DEPEND="dev-java/jsr305:0" +# min java 11 for bug #919464 +DEPEND="${CP_DEPEND} + >=virtual/jdk-11:*" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="com.github.benmanes.caffeine" diff --git a/dev-java/caffeine/caffeine-2.6.2.ebuild b/dev-java/caffeine/caffeine-2.6.2.ebuild deleted file mode 100644 index e55aadd659b2..000000000000 --- a/dev-java/caffeine/caffeine-2.6.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.github.ben-manes.caffeine:caffeine:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A high performance caching library" -HOMEPAGE="https://github.com/ben-manes/caffeine" -SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/${PV}/caffeine-${PV}-sources.jar" -# Compiling from Github would require to be packaged at least -# package com.squareup.javapoet -# package MethodSpec -# package TypeSpec -# SRC_URI="https://github.com/ben-manes/caffeine/archive/v${PV}.tar.gz -> ${P}.tar.gz" -# S="${WORKDIR}/${P}/caffeine" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -BDEPEND="app-arch/unzip" -CP_DEPEND="dev-java/jsr305:0" -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.8:*" -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" - -JAVA_AUTOMATIC_MODULE_NAME="com.github.benmanes.caffeine" diff --git a/dev-java/commons-codec/commons-codec-1.16.1.ebuild b/dev-java/commons-codec/commons-codec-1.16.1.ebuild index e092312d1927..96485a4fea70 100644 --- a/dev-java/commons-codec/commons-codec-1.16.1.ebuild +++ b/dev-java/commons-codec/commons-codec-1.16.1.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux" RESTRICT="test" #839681 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" diff --git a/dev-java/commons-compress/commons-compress-1.26.1.ebuild b/dev-java/commons-compress/commons-compress-1.26.1.ebuild index b51066f5a17e..c8764e448be2 100644 --- a/dev-java/commons-compress/commons-compress-1.26.1.ebuild +++ b/dev-java/commons-compress/commons-compress-1.26.1.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" diff --git a/dev-java/commons-lang/commons-lang-3.14.0.ebuild b/dev-java/commons-lang/commons-lang-3.14.0.ebuild index 51add8c5a5af..556c3414c385 100644 --- a/dev-java/commons-lang/commons-lang-3.14.0.ebuild +++ b/dev-java/commons-lang/commons-lang-3.14.0.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}3-${PV}-src" LICENSE="Apache-2.0" SLOT="3.6" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/commons-net/commons-net-3.10.0.ebuild b/dev-java/commons-net/commons-net-3.10.0.ebuild index d49ece23e44e..d4161a272d96 100644 --- a/dev-java/commons-net/commons-net-3.10.0.ebuild +++ b/dev-java/commons-net/commons-net-3.10.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://apache/commons/net/source/commons-net-${PV}-src.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/commons-validator/commons-validator-1.8.0.ebuild b/dev-java/commons-validator/commons-validator-1.8.0.ebuild index 293c25a82599..e92d0c4c8374 100644 --- a/dev-java/commons-validator/commons-validator-1.8.0.ebuild +++ b/dev-java/commons-validator/commons-validator-1.8.0.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ppc64 x86" RESTRICT="test" #839681 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" diff --git a/dev-java/failureaccess/Manifest b/dev-java/failureaccess/Manifest deleted file mode 100644 index 8b31a66a0288..000000000000 --- a/dev-java/failureaccess/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST guava-32.1.3.tar.gz 5757923 BLAKE2B 6bba8f721399f3d346410f1d00f0f5d97e14e347cdcab70465b449c7d7226fc5d194c25f257029eca15d426ec23e5907632a526120387eb465b3132571855862 SHA512 8efd8072e0aafaa851e18a69af011cbaeba207a7ee2dbe2daee9f70729c1c785d054197e6bf032d30065245070088f9f2d7f1a01f244b00325a3ede9d00fb9ec diff --git a/dev-java/failureaccess/failureaccess-32.1.3.ebuild b/dev-java/failureaccess/failureaccess-32.1.3.ebuild deleted file mode 100644 index 753445e72cb5..000000000000 --- a/dev-java/failureaccess/failureaccess-32.1.3.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_P=guava-${PV} - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="com.google.guava:failureaccess:1.0.1" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Guava's InternalFutureFailureAccess and InternalFutures classes." -HOMEPAGE="https://github.com/google/guava/" -SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -JAVA_SRC_DIR="futures/${PN}/src/com/google/common/util/concurrent/internal/" diff --git a/dev-java/failureaccess/metadata.xml b/dev-java/failureaccess/metadata.xml deleted file mode 100644 index 599c42537433..000000000000 --- a/dev-java/failureaccess/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - java@gentoo.org - Java - - -Contains com.google.common.util.concurrent.internal.InternalFutureFailureAccess -and InternalFutures. Most users will never need to use this artifact. Its -classes are conceptually a part of Guava, but they're in this separate artifact -so that Android libraries can use them without pulling in all of Guava (just as -they can use ListenableFuture by depending on the listenablefuture artifact). - - - google/guava - - diff --git a/dev-java/gnu-jaf/Manifest b/dev-java/gnu-jaf/Manifest deleted file mode 100644 index bc1c053be9b8..000000000000 --- a/dev-java/gnu-jaf/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST activation-1.1.2.tar.gz 290644 BLAKE2B 15ec89a5c757bb134b9ec71e384a80dea5394b9b6463ca1fe44e2e622993fa8809231379b262b0a54595c32451a49ef508bea45ce82120138efe07d81939a817 SHA512 26534f7bb47daddf97b850ab74fc8ef2c5bd62d12cfb96e28e235071af7dcfc7761fa15f2d8f3a2d194f035665cef127812b7476af6cc81f6d6374f1fa725584 diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild deleted file mode 100644 index 6835f9c1d704..000000000000 --- a/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="GNU implementation of the JavaBeans Activation Framework" -HOMEPAGE="https://www.gnu.org/software/classpathx/jaf/jaf.html" -SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz" - -LICENSE="GPL-2-with-linking-exception" -SLOT="1" -KEYWORDS="amd64 ppc64 x86" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -S="${WORKDIR}/activation-${PV}" - -EANT_BUILD_TARGET="activation.jar" - -src_install() { - java-pkg_dojar activation.jar - einstalldocs - use doc && java-pkg_dojavadoc docs - use source && java-pkg_dosrc source/* -} diff --git a/dev-java/gnu-jaf/metadata.xml b/dev-java/gnu-jaf/metadata.xml deleted file mode 100644 index ab2d72bd90a7..000000000000 --- a/dev-java/gnu-jaf/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - java@gentoo.org - Java - - - -GNU JAF is a framework for declaring what beans operate on what MIME -type data. Content handler beans can be defined to handle particular -MIME content. The JAF unites internet standards for declaring content -with JavaBeans™. - -The JAF defines two mechanisms within the framework. The first, the -file type map, specifies the MIME content type for a given file. The -default implementation of this uses the UNIX mime.types format to map -filename extensions to MIME types. The second mechanism, the command -map, specifies the actions that can be applied to a given MIME content -type. The default implementation of this uses the standard mailcap format -to map actions to JavaBean™ classes. These beans can then view, edit, -print, or perform whatever other action is required on the underlying -resource. - - - diff --git a/dev-java/icu4j/icu4j-74.2-r1.ebuild b/dev-java/icu4j/icu4j-74.2-r1.ebuild new file mode 100644 index 000000000000..df2c5aa4daba --- /dev/null +++ b/dev-java/icu4j/icu4j-74.2-r1.ebuild @@ -0,0 +1,193 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_PROVIDES=" + com.ibm.icu:icu4j:${PV} + com.ibm.icu:icu4j-charset:${PV} + com.ibm.icu:icu4j-localespi:${PV} +" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A set of Java libraries providing Unicode and Globalization support" +HOMEPAGE="https://icu.unicode.org" +SRC_URI="https://github.com/unicode-org/icu/archive/release-${PV/./-}.tar.gz -> icu-${PV}.tar.gz" +S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main" + +LICENSE="icu" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( dev-java/junitparams:0 ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( ../../{CONTRIBUTING,README,SECURITY}.md ) +HTML_DOCS=( ../{APIChangeReport,readme}.html ) + +src_compile() { + JAVA_GENTOO_CLASSPATH_EXTRA="icu4j.jar:icu4j-charset.jar:icu4j-localespi.jar" + + einfo "Compiling icu4j.jar" + JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu" + JAVA_JAR_FILENAME="icu4j.jar" + JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo" + JAVA_RESOURCE_DIRS=( + collate/src/main/resources + core/src/main/resources + currdata/src/main/resources + langdata/src/main/resources + regiondata/src/main/resources + translit/src/main/resources + ) + JAVA_SRC_DIR=( + collate/src/main/java + core/src/main/java + currdata/src/main/java + langdata/src/main/java + regiondata/src/main/java + translit/src/main/java + ) + java-pkg-simple_src_compile + rm -r target || die + + einfo "Compiling icu4j-charset.jar" + JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.charset" + JAVA_JAR_FILENAME="icu4j-charset.jar" + JAVA_MAIN_CLASS="" + JAVA_RESOURCE_DIRS=( charset/src/main/resources ) + JAVA_SRC_DIR=( charset/src/main/java ) + java-pkg-simple_src_compile + rm -r target || die + + einfo "Compiling icu4j-localespi.jar" + JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.localespi" + JAVA_JAR_FILENAME="icu4j-localespi.jar" + JAVA_RESOURCE_DIRS=( localespi/src/main/resources ) + JAVA_SRC_DIR=( localespi/src/main/java ) + java-pkg-simple_src_compile + rm -r target || die + + # javadocs + if use doc; then + einfo "Compiling javadocs" + JAVA_JAR_FILENAME="ignoreme.jar" + JAVA_SRC_DIR=( + collate/src/main/java + core/src/main/java + currdata/src/main/java + langdata/src/main/java + regiondata/src/main/java + translit/src/main/java + charset/src/main/java + localespi/src/main/java + ) + java-pkg-simple_src_compile + fi +} + +src_test () { + # TZ needed for some tests in com/ibm/icu/dev/test/format/DateFormatTest + export LC_ALL="en_US.UTF-8" TZ="US/Pacific" + + JAVA_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI" + JAVA_TEST_GENTOO_CLASSPATH="junit-4,junitparams" + + einfo "Compiling framework-tests.jar" + JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.framework" + JAVA_JAR_FILENAME="framework-tests.jar" + JAVA_MAIN_CLASS="com.ibm.icu.dev.test.TestAll" + JAVA_RESOURCE_DIRS=( framework/src/test/resources ) + JAVA_SRC_DIR=( framework/src/test/java ) + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":framework-tests.jar" + + einfo "Testing core aka icu4j.jar" + JAVA_TEST_RESOURCE_DIRS="core/src/test/resources" + JAVA_TEST_SRC_DIR="core/src/test/java" + pushd "${JAVA_TEST_SRC_DIR}" || die + # exclude invalid tests, not run by "mvn test" + local JAVA_TEST_RUN_ONLY=$(find * \ + -name "*Test*.java" \ + ! -name "ChineseTestCase.java" \ + ! -name "DataDrivenNumberFormatTestUtility.java" \ + ! -name "*Helper.java" \ + ! -name "ModuleTest.java" \ + ! -name "*Sample.java" \ + ! -name "TestCase.java" \ + ! -name "*TestData*.java" \ + ! -name "*TestFmwk.java" \ + ! -name "TestMessages.java" \ + ! -name "TestUtils.java" \ + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test + + einfo "Creating core-tests.jar" + jar cvf core-tests.jar -C target/test-classes . + JAVA_GENTOO_CLASSPATH_EXTRA+=":core-tests.jar" + JAVA_TEST_RUN_ONLY="" + + einfo "Testing collate" + JAVA_TEST_RESOURCE_DIRS="collate/src/test/resources" + JAVA_TEST_SRC_DIR="collate/src/test/java" + java-pkg-simple_src_test + + einfo "Testing translit" + JAVA_TEST_EXCLUDES=( + # Invalid test classes, No runnable methods + com.ibm.icu.dev.test.TestBoilerplate + com.ibm.icu.dev.test.translit.TestUtility + ) + JAVA_TEST_RESOURCE_DIRS="translit/src/test/resources" + JAVA_TEST_SRC_DIR="translit/src/test/java" + java-pkg-simple_src_test + + einfo "Testing charset" + JAVA_TEST_RESOURCE_DIRS="" + JAVA_TEST_SRC_DIR="charset/src/test/java" + java-pkg-simple_src_test + + einfo "Testing common_tests" + # "mvn test" runs only 90 tests here, Gentoo runs 99 but 9 of them fail. + # coverage tests fail because test handlers for the parametrized tests + # are not defined so the tests are broken and cannot succeed + JAVA_TEST_EXCLUDES=( com.ibm.icu.dev.test.serializable.CoverageTest ) + JAVA_TEST_RESOURCE_DIRS="" + JAVA_TEST_SRC_DIR="common_tests/src/test/java" + java-pkg-simple_src_test + + einfo "Testing localespi" + JAVA_TEST_RESOURCE_DIRS="" + JAVA_TEST_SRC_DIR="localespi/src/test/java" + # Invalid test classes, No runnable methods + JAVA_TEST_EXCLUDES=( com.ibm.icu.dev.test.localespi.TestUtil ) + # https://bugs.gentoo.org/827212, "mvn test" does not run it at all + local vm_version="$(java-config -g PROVIDES_VERSION)" + if [[ "${vm_version}" != "1.8" ]] ; then + java-pkg-simple_src_test + fi +} + +src_install() { + default + java-pkg_dojar "icu4j.jar" + java-pkg_dojar "icu4j-charset.jar" + java-pkg_dojar "icu4j-localespi.jar" + + if use doc; then + java-pkg_dojavadoc target/api + fi + if use source; then + java-pkg_dosrc "classes" + fi +} diff --git a/dev-java/icu4j/icu4j-74.2.ebuild b/dev-java/icu4j/icu4j-74.2.ebuild deleted file mode 100644 index 8f2660e0cdd6..000000000000 --- a/dev-java/icu4j/icu4j-74.2.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_PROVIDES=" - com.ibm.icu:icu4j:${PV} - com.ibm.icu:icu4j-charset:${PV} - com.ibm.icu:icu4j-localespi:${PV} -" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A set of Java libraries providing Unicode and Globalization support" -HOMEPAGE="https://icu.unicode.org" -SRC_URI="https://github.com/unicode-org/icu/archive/release-${PV/./-}.tar.gz -> icu-${PV}.tar.gz" -S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main" - -LICENSE="icu" -SLOT="70" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( dev-java/junitparams:0 ) -" - -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( ../../{CONTRIBUTING,README,SECURITY}.md ) -HTML_DOCS=( ../{APIChangeReport,readme}.html ) - -src_compile() { - JAVA_GENTOO_CLASSPATH_EXTRA="icu4j.jar:icu4j-charset.jar:icu4j-localespi.jar" - - einfo "Compiling icu4j.jar" - JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu" - JAVA_JAR_FILENAME="icu4j.jar" - JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo" - JAVA_RESOURCE_DIRS=( - collate/src/main/resources - core/src/main/resources - currdata/src/main/resources - langdata/src/main/resources - regiondata/src/main/resources - translit/src/main/resources - ) - JAVA_SRC_DIR=( - collate/src/main/java - core/src/main/java - currdata/src/main/java - langdata/src/main/java - regiondata/src/main/java - translit/src/main/java - ) - java-pkg-simple_src_compile - rm -r target || die - - einfo "Compiling icu4j-charset.jar" - JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.charset" - JAVA_JAR_FILENAME="icu4j-charset.jar" - JAVA_MAIN_CLASS="" - JAVA_RESOURCE_DIRS=( charset/src/main/resources ) - JAVA_SRC_DIR=( charset/src/main/java ) - java-pkg-simple_src_compile - rm -r target || die - - einfo "Compiling icu4j-localespi.jar" - JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.localespi" - JAVA_JAR_FILENAME="icu4j-localespi.jar" - JAVA_RESOURCE_DIRS=( localespi/src/main/resources ) - JAVA_SRC_DIR=( localespi/src/main/java ) - java-pkg-simple_src_compile - rm -r target || die - - # javadocs - if use doc; then - einfo "Compiling javadocs" - JAVA_JAR_FILENAME="ignoreme.jar" - JAVA_SRC_DIR=( - collate/src/main/java - core/src/main/java - currdata/src/main/java - langdata/src/main/java - regiondata/src/main/java - translit/src/main/java - charset/src/main/java - localespi/src/main/java - ) - java-pkg-simple_src_compile - fi -} - -src_test () { - # TZ needed for some tests in com/ibm/icu/dev/test/format/DateFormatTest - export LC_ALL="en_US.UTF-8" TZ="US/Pacific" - - JAVA_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI" - JAVA_TEST_GENTOO_CLASSPATH="junit-4,junitparams" - - einfo "Compiling framework-tests.jar" - JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.framework" - JAVA_JAR_FILENAME="framework-tests.jar" - JAVA_MAIN_CLASS="com.ibm.icu.dev.test.TestAll" - JAVA_RESOURCE_DIRS=( framework/src/test/resources ) - JAVA_SRC_DIR=( framework/src/test/java ) - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":framework-tests.jar" - - einfo "Testing core aka icu4j.jar" - JAVA_TEST_RESOURCE_DIRS="core/src/test/resources" - JAVA_TEST_SRC_DIR="core/src/test/java" - pushd "${JAVA_TEST_SRC_DIR}" || die - # exclude invalid tests, not run by "mvn test" - local JAVA_TEST_RUN_ONLY=$(find * \ - -name "*Test*.java" \ - ! -name "ChineseTestCase.java" \ - ! -name "DataDrivenNumberFormatTestUtility.java" \ - ! -name "*Helper.java" \ - ! -name "ModuleTest.java" \ - ! -name "*Sample.java" \ - ! -name "TestCase.java" \ - ! -name "*TestData*.java" \ - ! -name "*TestFmwk.java" \ - ! -name "TestMessages.java" \ - ! -name "TestUtils.java" \ - ) - popd - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - java-pkg-simple_src_test - - einfo "Creating core-tests.jar" - jar cvf core-tests.jar -C target/test-classes . - JAVA_GENTOO_CLASSPATH_EXTRA+=":core-tests.jar" - JAVA_TEST_RUN_ONLY="" - - einfo "Testing collate" - JAVA_TEST_RESOURCE_DIRS="collate/src/test/resources" - JAVA_TEST_SRC_DIR="collate/src/test/java" - java-pkg-simple_src_test - - einfo "Testing translit" - JAVA_TEST_EXCLUDES=( - # Invalid test classes, No runnable methods - com.ibm.icu.dev.test.TestBoilerplate - com.ibm.icu.dev.test.translit.TestUtility - ) - JAVA_TEST_RESOURCE_DIRS="translit/src/test/resources" - JAVA_TEST_SRC_DIR="translit/src/test/java" - java-pkg-simple_src_test - - einfo "Testing charset" - JAVA_TEST_RESOURCE_DIRS="" - JAVA_TEST_SRC_DIR="charset/src/test/java" - java-pkg-simple_src_test - - einfo "Testing common_tests" - # "mvn test" runs only 90 tests here, Gentoo runs 99 but 9 of them fail. - # coverage tests fail because test handlers for the parametrized tests - # are not defined so the tests are broken and cannot succeed - JAVA_TEST_EXCLUDES=( com.ibm.icu.dev.test.serializable.CoverageTest ) - JAVA_TEST_RESOURCE_DIRS="" - JAVA_TEST_SRC_DIR="common_tests/src/test/java" - java-pkg-simple_src_test - - einfo "Testing localespi" - JAVA_TEST_RESOURCE_DIRS="" - JAVA_TEST_SRC_DIR="localespi/src/test/java" - # Invalid test classes, No runnable methods - JAVA_TEST_EXCLUDES=( com.ibm.icu.dev.test.localespi.TestUtil ) - # https://bugs.gentoo.org/827212, "mvn test" does not run it at all - local vm_version="$(java-config -g PROVIDES_VERSION)" - if [[ "${vm_version}" != "1.8" ]] ; then - java-pkg-simple_src_test - fi -} - -src_install() { - default - java-pkg_dojar "icu4j.jar" - java-pkg_dojar "icu4j-charset.jar" - java-pkg_dojar "icu4j-localespi.jar" - - if use doc; then - java-pkg_dojavadoc target/api - fi - if use source; then - java-pkg_dosrc "classes" - fi -} diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest index b05142bce90b..aea384cd1646 100644 --- a/dev-java/javacc/Manifest +++ b/dev-java/javacc/Manifest @@ -1,4 +1,3 @@ DIST javacc-4.1.tar.gz 769476 BLAKE2B c2a22fa78ff4dcf1e36221a23ca1e3cd1eecb473a59ea94ce52e298673f6bd18c0ea0cf757dd68885696ebc8cc724d271c69c923a21ffa433d03c1062b1201ee SHA512 911e5e9f062561ade1748dcef3596e0f25c399c4d52dd174773783dadf24a4ceea8d3feab9ab08880370677959051d8557aed815d4c4184f5ecd5789ee8a5754 -DIST javacc-5.0src.tar.gz 810123 BLAKE2B 6833e79a33c7ae8b28902d1c372162a2f9e326629f0d4c1936a8c3638d3aa3f6bd5713aca8398ba5f1ff963fe585eb683fcd3009602ee592ba79692c8ba0f3d6 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6 DIST javacc-7.0.13.tar.gz 3199783 BLAKE2B 7e3dddbe53a6e417a31bb7386d154c0e9589f17f88e652f5e146a4e344d72cd948d4d8e55fab753bb983e5d31971efc948c1ecdca4e875031bea3f8a38bfc082 SHA512 ed71e47fc4a382c9c53067bbf73bd9736ee0c41d65e328d5e4843cd71c88d3b7715d7a8fe38f10152ef7ef3be064abf9e801c6ea78066c4fcbabf124dfc4e144 DIST javacc-7.0.4.tar.gz 2842349 BLAKE2B e5a2e24c99e5e3883270cf0e3931d7667e5b5b49a11c1d9b79b98767f74f4addf2dc7d3d620550bc1b5bb0bfbef8bf07af48a40d250d0902d97c8215f6cb8e01 SHA512 b93c93e8490aae9a26b0de948896ec6d7a044c205d09584c3908988e24a3ea63a1147365115b17a15c6fb311c44f53ddff7c11f092731cbd05d3ec1950ef57f1 diff --git a/dev-java/javacc/javacc-4.1.ebuild b/dev-java/javacc/javacc-4.1.ebuild index 617899a0dcfd..f74f36d4eb2f 100644 --- a/dev-java/javacc/javacc-4.1.ebuild +++ b/dev-java/javacc/javacc-4.1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/javacc-release_${PV//./}" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" CP_DEPEND="dev-java/junit:0" diff --git a/dev-java/javacc/javacc-5.0-r5.ebuild b/dev-java/javacc/javacc-5.0-r5.ebuild deleted file mode 100644 index 6df77f9fca66..000000000000 --- a/dev-java/javacc/javacc-5.0-r5.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc examples source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java Compiler Compiler - The Java Parser Generator" -HOMEPAGE="https://javacc.github.io/javacc/" -SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz" - -LICENSE="BSD" -SLOT="0" - -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - -CDEPEND="dev-java/junit:0" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.8:* - test? ( >=dev-java/ant-1.10.14:0[junit] )" - -S="${WORKDIR}/${PN}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.0-javadoc.patch -) - -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_CLASSPATH_TAGS+=" javadoc" - -EANT_GENTOO_CLASSPATH="junit" - -src_prepare() { - default #780585 - - rm -v lib/junit*/*.jar || die -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_dojar "bin/lib/${PN}.jar" - - if use doc; then - java-pkg_dohtml -r www/* - java-pkg_dojavadoc doc/api - fi - - use examples && java-pkg_doexamples examples - use source && java-pkg_dosrc src/* - - echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc || die - doenvd "${T}"/22javacc - - echo "export VERSION=${PV}" > "${T}"/pre || die - - local launcher - for launcher in javacc jjdoc jjtree; do - java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher} - done - - einstalldocs -} diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest index b39662917f89..27c5a47904df 100644 --- a/dev-java/jdbc-mysql/Manifest +++ b/dev-java/jdbc-mysql/Manifest @@ -1,2 +1,4 @@ DIST mysql-connector-j-8.1.0.tar.gz 4241696 BLAKE2B 930257a876b1b512b598ebf8397125145bb9d1a438fe33bb55ca208dddfdd29bd436a365cc35b9128cdee6eee436da688dd53cc3ed6cd04efb22d1f5af731863 SHA512 f8a7c621397f49981dd7d19e880d92ee051015ad011c027380ac85760dc22ce2f4117fd27b8d72325c5e2bc40a1a9c22e9534f7200208916ee62bbf1e5ad0c75 +DIST mysql-connector-j-8.3.0.tar.gz 4255433 BLAKE2B b5cd437e4ab87052c0fd8e4da6a2612d4c068193a4fe2d207505b2f42d664a414c8a0f3131f34b471a30bfa6b6bb9e76ad0dd4779abbecb46ea014ab5d06e36d SHA512 0849ff13f4adc4ae2d2b9f64ff192435dd9560763a50c7df117a171ae1d90fc97bc36dc89097472d0a2c182492a45ca14ffcf577a9c54267be79e5b3f147dc41 DIST oci-java-sdk-common-2.47.0.jar 439209 BLAKE2B b3b28bb0cf4b8dbca37bb34df7bb48029901be5d9f7754a2ccce888a9af4a06b3348cd545d480127f942687b9b0d63336c37b5f95ecb9f96111c9388a4bc6053 SHA512 73e7376c92d47d81e0630e2ad2d510a483068664874ae31622629dad6dc016d746499c2d29682563e5cdee35ddb6e9e59a2e7557d32e1eeec5fb12206f9d1d6e +DIST oci-java-sdk-common-3.29.0.jar 453619 BLAKE2B 41a68344a9cf4733c642e3a6e4254f3991f19c13edf57b3c61352b1e6ffdfabfe29cd8dccaa9b128fae618a492fb342007d14ad65b06cd614da572c787cf35ab SHA512 b6def960e114b69d3f34706d5e293f0a05b30c31a1443a92e454631712bb633eaea3795beeeabe4eb1303b8ad42ef2b73d69880b73d360e193f8f1b532bc3430 diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild new file mode 100644 index 000000000000..649d226c823b --- /dev/null +++ b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Tests disabled, see bug #902723 +JAVA_PKG_IUSE="doc source" +MAVEN_ID="com.mysql:mysql-connector-j:8.1.0" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +# Bundling a binary version of oci-java-sdk-common +# https://github.com/oracle/oci-java-sdk/blob/v2.47.0/bmc-common/pom.xml +OSC="2.47.0" + +DESCRIPTION="JDBC Type 4 driver for MySQL" +HOMEPAGE="https://dev.mysql.com/doc/connector-j/en/" +SRC_URI="https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${PV}.tar.gz + https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/${OSC}/oci-java-sdk-common-${OSC}.jar" + +S="${WORKDIR}/mysql-connector-j-${PV}" + +LICENSE="GPL-2-with-MySQL-FLOSS-exception" +SLOT="0" +KEYWORDS="amd64 ppc64 x86" + +CP_DEPEND=" + dev-java/c3p0:0 + \ + src/main/res/META-INF/services/java.nio.file.spi.FileSystemProvider || die +} + +src_test() { + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar" + # Using the defaults of java-pkg-simple would exclude + # several tests which are run by "mvn test". + pushd src/test/java > /dev/null || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -name "*Test.java" \ + ! -name AbstractGlob*.java \ + ! -name AbstractPathMatcherTest.java \ + ! -name AbstractJimfsIntegrationTest.java \ + ! -name AbstractAttributeProviderTest.java \ + ) + popd > /dev/null + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} diff --git a/dev-java/jimfs/metadata.xml b/dev-java/jimfs/metadata.xml new file mode 100644 index 000000000000..e1353ba1e585 --- /dev/null +++ b/dev-java/jimfs/metadata.xml @@ -0,0 +1,10 @@ + + + + + java@gentoo.org + + + google/jimfs + + diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest index 4b7a16b268c1..05f94127628e 100644 --- a/dev-java/json/Manifest +++ b/dev-java/json/Manifest @@ -1,4 +1,4 @@ DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183 DIST json-20240205.tar.gz 245788 BLAKE2B 2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df SHA512 55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284 DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6 -DIST json-path-2.4.0.jar 223186 BLAKE2B b184f1b8241bd9b4c5d10662354f31044ea90bddfa7a08c0c995a02e7e50b04d11076d61af2988c2fee49401ad37593f89dd2dbc0bfa0e1b5b1d0653a592eea1 SHA512 b55b30cf85ca12e6a492fd48d4b6bb0b1f3ba610c195aa1a36eda2a80e24bf7688a6a802362d398108e822f6dcb7b713cf421bb4208897fc4f5cc7b8b9b4c97c +DIST json-path-2.9.0.jar 276633 BLAKE2B bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862 SHA512 9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a diff --git a/dev-java/json/json-20240205-r1.ebuild b/dev-java/json/json-20240205-r1.ebuild new file mode 100644 index 000000000000..49f6e727afd8 --- /dev/null +++ b/dev-java/json/json-20240205-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.json:json:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A reference implementation of a JSON package in Java" +HOMEPAGE="https://github.com/stleary/JSON-java" +JPV="2.9.0" +SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz + test? ( + https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar + )" +S="${WORKDIR}/JSON-java-${PV}" + +LICENSE="JSON" +SLOT="0" +KEYWORDS="amd64 ~x86" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/asm:9 + dev-java/json-smart:2 + dev-java/mockito:4 + dev-java/slf4j-api:0 + ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {CONTRIBUTING,README,SECURITY}.md ) + +JAVA_AUTOMATIC_MODULE_NAME="org.json" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH=" + asm-9 + json-smart-2 + junit-4 + mockito-4 + slf4j-api +" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +src_test() { + JAVA_TEST_EXTRA_ARGS=( -Xss2M ) + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency + + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge 17; then + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED ) + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED ) + fi + java-pkg-simple_src_test +} diff --git a/dev-java/json/json-20240205.ebuild b/dev-java/json/json-20240205.ebuild deleted file mode 100644 index b38dc12dd901..000000000000 --- a/dev-java/json/json-20240205.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.json:json:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A reference implementation of a JSON package in Java" -HOMEPAGE="https://github.com/stleary/JSON-java" -JPV="2.4.0" -SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz - test? ( - https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar - )" -S="${WORKDIR}/JSON-java-${PV}" - -LICENSE="JSON" -SLOT="0" -KEYWORDS="amd64 ~x86" - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/asm:9 - dev-java/json-smart:2 - dev-java/mockito:4 - dev-java/slf4j-api:0 - ) -" - -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( {CONTRIBUTING,README,SECURITY}.md ) - -JAVA_AUTOMATIC_MODULE_NAME="org.json" -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH=" - asm-9 - json-smart-2 - junit-4 - mockito-4 - slf4j-api -" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -src_test() { - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency - - local vm_version="$(java-config -g PROVIDES_VERSION)" - if ver_test "${vm_version}" -ge 17; then - JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED ) - JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED ) - fi - java-pkg-simple_src_test -} diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest index 02e2cf8a230a..88d8a813f89d 100644 --- a/dev-java/junit/Manifest +++ b/dev-java/junit/Manifest @@ -1,3 +1,6 @@ DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb +DIST junit-4.13.2_p20240222.tar.gz 1007781 BLAKE2B 4eeab59aa7ff3cc65c73318acb562523e6ba781da6a0baf28f8fa82042f1affddb583d188c550207a7e267b3475f4a546e8e25eba61d5ba36d13bd7e277ad156 SHA512 89506413b7aca7c2d0b41c8297dde48c1b90a44133bfb3ebf300247c7837839a3aff2d785d891ddb8762427d718eacf016a1d67e2e24edda05f4eae36ca311f1 +DIST junit-5.10.2.tar.gz 2942035 BLAKE2B 4880df74b7cbf23acd34c716f9fce26edd28b31c14d720e129e9e1f06aa35b70c447a0d87904e083a54663fba17e0b2b470678dc32480e0a11c5ebf46d5fe38e SHA512 c36ff7c2bd21f9a64c93b836fc1017a8a96ebcc0079cf1d95b09f5b764435178c2dc2336f2493e7e4df561013693dce4f08dfe0cf3bd76cc9b820313f64d064f DIST junit-5.9.2.tar.gz 2882173 BLAKE2B 6baf8768654b399d64237a110dcb6a821ab7dc8964254a5d00f7ffb65c789818aed51ad7042a963a47669042baaeec87b5d0453643a2b0eeeaf6393a42c75fd6 SHA512 5673577f773042b4e253241d27298a60dbac239502788e1d999fbe0d3ffe76b29c90d4fb43660f2e2e00e3e9b8d4c1b6b909ff95dc6e87ccb6f7b009ae6b0e78 DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930 +DIST junit5-java18-compatibility.patch 742 BLAKE2B 89bfa36330278cdee2f7f66ed5527895e650a7b490d3f3695772a27541be1d8383c1742bab4e8494f3a84c29f93f553880a3bd5cd4d84792cf662fbc33a6e594 SHA512 5a9a562eb61a875764da369ff40da6ff95c6de8b3b3ecb612634112076741d75d6eab385743843b4fe7ca8a1827960e06550f6e90c8b7ef75b55006b41c416cd diff --git a/dev-java/junit/files/junit-4.13.2_p20240222-ignore-failing-test.patch b/dev-java/junit/files/junit-4.13.2_p20240222-ignore-failing-test.patch new file mode 100644 index 000000000000..512f680c3aaf --- /dev/null +++ b/dev-java/junit/files/junit-4.13.2_p20240222-ignore-failing-test.patch @@ -0,0 +1,85 @@ +1) lookingForStuckThread_threadGroupNotLeaked[lookingForStuckThread = true](org.junit.internal.runners.statements.FailOnTimeoutTest) +java.lang.AssertionError: the 'FailOnTimeoutGroup' thread group should be destroyed after running the test + at org.junit.Assert.fail(Assert.java:89) + at org.junit.Assert.assertTrue(Assert.java:42) + at org.junit.internal.runners.statements.FailOnTimeoutTest.lookingForStuckThread_threadGroupNotLeaked(FailOnTimeoutTest.java:207) + at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59) + at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) + at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:61) + at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) + at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) + at org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100) + at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366) + at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103) + at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63) + at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331) + at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79) + at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329) + at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66) + at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293) + at org.junit.runners.ParentRunner.run(ParentRunner.java:413) + at org.junit.runners.Suite.runChild(Suite.java:128) + at org.junit.runners.Suite.runChild(Suite.java:27) + at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331) + at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79) + at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329) + at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66) + at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293) + at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) + at org.junit.runners.ParentRunner.run(ParentRunner.java:413) + at org.junit.runners.Suite.runChild(Suite.java:128) + at org.junit.runners.Suite.runChild(Suite.java:27) + at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331) + at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79) + at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329) + at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66) + at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293) + at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) + at org.junit.runners.ParentRunner.run(ParentRunner.java:413) + at org.junit.runners.Suite.runChild(Suite.java:128) + at org.junit.runners.Suite.runChild(Suite.java:27) + at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331) + at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79) + at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329) + at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66) + at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293) + at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) + at org.junit.runners.ParentRunner.run(ParentRunner.java:413) + at org.junit.runners.Suite.runChild(Suite.java:128) + at org.junit.runners.Suite.runChild(Suite.java:27) + at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331) + at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79) + at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329) + at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66) + at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293) + at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) + at org.junit.runners.ParentRunner.run(ParentRunner.java:413) + at org.junit.runner.JUnitCore.run(JUnitCore.java:141) + at org.junit.runner.JUnitCore.run(JUnitCore.java:119) + at org.junit.runner.JUnitCore.runMain(JUnitCore.java:81) + at org.junit.runner.JUnitCore.runMain(JUnitCore.java:40) + at org.junit.runner.JUnitCore.main(JUnitCore.java:36) + +FAILURES!!! +Tests run: 1106, Failures: 1 +--- a/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java ++++ b/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java +@@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean; + import java.util.concurrent.atomic.AtomicReference; + + import org.junit.Test; ++import org.junit.Ignore; + import org.junit.function.ThrowingRunnable; + import org.junit.runner.RunWith; + import org.junit.runners.Parameterized; +@@ -181,7 +182,7 @@ public class FailOnTimeoutTest { + } + } + +- @Test ++ @Test @Ignore + public void lookingForStuckThread_threadGroupNotLeaked() throws Throwable { + assumeTrue(lookingForStuckThread); + final AtomicReference innerThreadGroup = new AtomicReference(); diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild index 2872a332ce63..da6bba7b5fed 100644 --- a/dev-java/junit/junit-3.8.2-r2.ebuild +++ b/dev-java/junit/junit-3.8.2-r2.ebuild @@ -1,31 +1,30 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source" MAVEN_ID="junit:junit:3.8.2" inherit java-pkg-2 java-pkg-simple -MY_P=${P/-/} - DESCRIPTION="Simple framework to write repeatable tests" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" -HOMEPAGE="http://www.junit.org/" +HOMEPAGE="https://junit.org/" +SRC_URI="mirror://sourceforge/project/junit/junit/${PV}/junit${PV}.zip" +S="${WORKDIR}/junit${PV}" + LICENSE="CPL-1.0" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +BDEPEND="app-arch/unzip" DEPEND=">=virtual/jdk-1.8" RDEPEND=">=virtual/jre-1.8" -DOCS=( README.html cpl-v10.html ) +HTML_DOCS=( README.html cpl-v10.html ) JAVA_SRC_DIR="${PN}" -S="${WORKDIR}/${MY_P}" - src_unpack() { unpack ${A} cd "${S}" || die @@ -33,11 +32,6 @@ src_unpack() { } src_prepare() { - default + java-pkg-2_src_prepare java-pkg_clean } - -src_install() { - java-pkg-simple_src_install - einstalldocs -} diff --git a/dev-java/junit/junit-4.13.2-r1.ebuild b/dev-java/junit/junit-4.13.2-r1.ebuild index af5e4f424217..0fa825c0272c 100644 --- a/dev-java/junit/junit-4.13.2-r1.ebuild +++ b/dev-java/junit/junit-4.13.2-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 diff --git a/dev-java/junit/junit-4.13.2_p20240222.ebuild b/dev-java/junit/junit-4.13.2_p20240222.ebuild new file mode 100644 index 000000000000..3ca8e79546cc --- /dev/null +++ b/dev-java/junit/junit-4.13.2_p20240222.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="junit:junit:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Simple framework to write repeatable tests" +HOMEPAGE="https://junit.org/junit4/" +MY_COMMIT="28fa2cae48b365c949935b28967ffb3f388e77ef" +SRC_URI="https://github.com/${PN}-team/${PN}4/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}4-${MY_COMMIT}" + +LICENSE="EPL-1.0" +SLOT="4" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +CP_DEPEND="dev-java/hamcrest-core:1.3" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* + test? ( dev-java/hamcrest-library:1.3 )" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +PATCHES=( "${FILESDIR}/junit-4.13.2_p20240222-ignore-failing-test.patch" ) + +JAVA_AUTOMATIC_MODULE_NAME="junit" +JAVA_ENCODING="ISO-8859-1" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} + +src_test() { + cd "${JAVA_TEST_SRC_DIR}" || die + + local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_TEST_GENTOO_CLASSPATH})" + + ejavac -cp "${CP}" -d . $(find * -name "*.java") + # pom.xml lines 264-268 + java -cp "${CP}" -Djava.awt.headless=true \ + org.junit.runner.JUnitCore org.junit.tests.AllTests || die "Running junit failed" +} diff --git a/dev-java/junit/junit-5.10.2.ebuild b/dev-java/junit/junit-5.10.2.ebuild new file mode 100644 index 000000000000..6e794beca258 --- /dev/null +++ b/dev-java/junit/junit-5.10.2.ebuild @@ -0,0 +1,351 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Declare the 'doc' USE flag in IUSE -- not JAVA_PKG_IUSE -- to +# prevent java-pkg-simple.eclass from handling Javadoc; instead, +# let this ebuild handle Javadoc generation and installation itself. +# This ebuild invokes java-pkg-simple.eclass's phase functions +# multiple times to build multiple modules, but the eclass always +# installs each module's Javadoc to the same directory, which would +# trigger an error when the second module's Javadoc is installed. +JAVA_PKG_IUSE="source test" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Simple framework to write repeatable tests" +HOMEPAGE="https://junit.org/junit5/" +DEB="5.10.1-1" +SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz + https://sources.debian.org/data/main/j/junit5/${DEB}/debian/patches/18-java-compatibility.patch \ + -> junit5-java18-compatibility.patch" +S="${WORKDIR}/junit5-r${PV}" + +LICENSE="EPL-2.0" +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64" +IUSE="doc migration-support suite vintage" + +CP_DEPEND=" + dev-java/apiguardian-api:0 + dev-java/opentest4j:0 + dev-java/open-test-reporting-events:0 + dev-java/picocli:0 + dev-java/univocity-parsers:0 +" + +# java-utils-2.eclass does not support +# USE-conditional dependencies in CP_DEPEND +COND_DEPEND=" + migration-support? ( dev-java/junit:4 ) + vintage? ( dev-java/junit:4 ) +" + +# Limiting JDK version to >=11 for module-info.java in this package +# https://bugs.gentoo.org/796875#c3 +DEPEND=" + >=virtual/jdk-11:* + ${CP_DEPEND} + ${COND_DEPEND} + test? ( dev-java/jimfs:0 ) +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CP_DEPEND} + ${COND_DEPEND} +" + +PATCHES=( + "${DISTDIR}/junit5-java18-compatibility.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} + +src_configure() { + # Please make sure to declare a module's dependencies before the module itself. + # Useful upstream documentation regarding modules and dependencies: + # https://junit.org/junit5/docs/current/user-guide/index.html#dependency-metadata + # https://junit.org/junit5/docs/current/user-guide/index.html#dependency-diagram + JUNIT5_MODULES=( + junit-platform-commons + junit-platform-engine + junit-platform-launcher + junit-platform-reporting + junit-platform-console # For launching tests from CLI; + # an eclass would need it to support running tests using JUnit 5 + + $(use suite && echo \ + junit-platform-suite-api \ + junit-platform-suite-commons \ + junit-platform-suite-engine \ + ) + + junit-jupiter-api + junit-jupiter-engine # For JUnit Jupiter tests -- the so-called + # "JUnit 5 tests", which cannot run on earlier JUnit versions + junit-jupiter-params # For parameterized tests; the junit-jupiter + # aggregator module includes it, so building it unconditionally + $(usev migration-support junit-jupiter-migrationsupport) + + $(usev vintage junit-vintage-engine) + + # Modules not included: + # - junit-bom: Has no sources; solely for helping Maven and Gradle + # projects that use JUnit 5 manage dependencies easier + # - junit-jupiter: Aggregator; does not have 'src/main/java' + # - junit-platform-console-standalone: Has no sources; solely used + # by the upstream to build a fat JAR that bundles everything, so + # users can use just this single JAR to run JUnit 5 + # - junit-platform-jfr: For an experimental feature + # - junit-platform-runner: Deprecated + # - junit-platform-suite: Aggregator; does not have 'src/main/java' + # - junit-platform-testkit: Requires >=dev-java/assertj-core-3.14.0 + ) + local cp_packages=() + (use migration-support || use vintage) && cp_packages+=( junit-4 ) + local save_IFS="${IFS}" + IFS=',' JAVA_GENTOO_CLASSPATH="${cp_packages[*]}" + IFS="${save_IFS}" + + JUNIT5_VM_VERSION="$(java-config --get-env PROVIDES_VERSION)" +} + +junit5_foreach_module() { + local module + for module in "${JUNIT5_MODULES[@]}"; do + junit5_module_do "${module}" "${@}" + done +} + +junit5_module_do() { + local module="${1}" + # Invocation of the passed function will not be guarded by '|| die'. + # Like the case for multibuild_foreach_variant(), it is recommended + # that the passed function itself calls 'die'. + local func=( "${@:2}" ) + + einfo "Running '${func[@]}' for ${module} ..." + pushd "${module}" > /dev/null || die "Failed to enter directory '${module}'" + + # Set up Java eclass variables that are + # supposed to be set in the ebuild global scope + + local JAVA_JAR_FILENAME="${module}.jar" + + local JAVA_SRC_DIR=( + src/main/java + src/module + ) + + local JAVA_RESOURCE_DIRS=() + local default_resource_dir="src/main/resources" + [[ -d "${default_resource_dir}" ]] && + JAVA_RESOURCE_DIRS+=( "${default_resource_dir}" ) + + if [[ "${module}" == junit-platform-console ]]; then + local JAVA_MAIN_CLASS="org.junit.platform.console.ConsoleLauncher" + local JAVA_LAUNCHER_FILENAME="${module}" + fi + + # Invoke the passed function + "${func[@]}" + local ret="${?}" + + popd > /dev/null || die "Failed to leave directory '${module}'" + return "${ret}" +} + +junit5_gen_cp() { + echo "$(java-pkg_getjars --build-only --with-dependencies \ + "${JAVA_GENTOO_CLASSPATH}"):${JAVA_GENTOO_CLASSPATH_EXTRA}" +} + +junit5_module_compile() { + if [[ "${module}" == junit-platform-console ]]; then + # Unlike other modules that have a src/main/java9 directory, for this + # module, the upstream puts the class files built from src/main/java9 + # in their JAR's top-level directory instead of META-INF/versions/9 + cp -rv src/main/java9/* src/main/java/ || + die "Failed to merge ${module}'s sources for Java 9+" + # Remove for the [[ -d src/main/java9 ]] test + # during versioned directory handling + rm -rv src/main/java9 || + die "Failed to remove ${module}'s Java 9+ source directory" + fi + + java-pkg-simple_src_compile + local sources="sources.lst" + local classes="target/classes" + + # Collect a list of all compiler input files for building Javadoc + local source + while read source; do + echo "${module}/${source}" >> "${all_sources}" + done < "${sources}" || + die "Failed to add ${module}'s sources to Javadoc input list" + + # Handle classes that will go into versioned directories. This will be + # no longer needed after https://bugs.gentoo.org/900433 is implemented. + local vm_ver + for vm_ver in 9 17; do + local versioned_src="src/main/java${vm_ver}" + if [[ -d "${versioned_src}" ]]; then + if ver_test "${JUNIT5_VM_VERSION}" -ge "${vm_ver}"; then + local versioned_classes="target/${vm_ver}/classes" + mkdir -p "${versioned_classes}" || + die "Failed to create directory for ${module}'s Java ${vm_ver}+ classes" + ejavac -d "${versioned_classes}" -encoding "${JAVA_ENCODING}" \ + -classpath "${classes}:$(junit5_gen_cp)" ${JAVAC_ARGS} \ + $(find "${versioned_src}" -type f -name '*.java') + "$(java-config --jar)" -uvf "${JAVA_JAR_FILENAME}" \ + --release "${vm_ver}" -C "${versioned_classes}" . || + die "Failed to add ${module}'s Java ${vm_ver}+ classes to JAR" + else + # Modules that may hit this branch as of 5.9.2: + # - junit-platform-console: + # src/main/java17/.../ConsoleUtils.java tries to use + # java.io.Console.charset() (available since Java 17) to get + # the default output charset. It is fine to not use this + # file, even if the built artifacts will be used on JRE 17+, + # as src/main/java/.../ConsoleUtils.java still gets the + # default from java.nio.charset.Charset.defaultCharset(). + elog "JDK ${JUNIT5_VM_VERSION} used; skipping Java ${vm_ver}-dependent parts in ${module}" + fi + fi + done + + # Add the current module's JAR to classpath + # for the module's reverse dependencies in this package + JAVA_GENTOO_CLASSPATH_EXTRA+=":${S}/${module}/${JAVA_JAR_FILENAME}" +} + +src_compile() { + local all_sources="${S}/all-sources.lst" + junit5_foreach_module junit5_module_compile + + if use doc; then + einfo "Generating Javadoc for all modules ..." + local apidoc="target/api" + mkdir -p "${apidoc}" || die "Failed to create Javadoc directory" + ejavadoc -d "${apidoc}" \ + -encoding "${JAVA_ENCODING}" -docencoding UTF-8 -charset UTF-8 \ + -classpath "$(junit5_gen_cp)" ${JAVADOC_ARGS:- -quiet} \ + -windowtitle "JUnit ${PV} API" \ + "@${all_sources}" + fi +} + +src_test() { + # Running the JUnit 5 modules' tests (located in each module's + # 'src/test/java') has a few obstacles: + # - Some test sources use text blocks -- a feature introduced in Java 15. + # A JDK at a lower version, e.g. 11, cannot compile them. + # - Some test classes depend on JUnit 5 modules that this ebuild does not + # include, like junit-platform-runner and junit-platform-testkit. + # + # Therefore, this ebuild uses a simpler approach to test the artifacts just + # built: it uses the artifacts to run tests in examples under the + # 'documentation/src' directory. The test coverage will not be impressive, + # but at least this approach verifies that the copy of JUnit 5 just built + # is capable of running some simple tests launched from CLI. + + local JUNIT5_TEST_SRC_DIR="documentation/src/test/java" + local JUNIT5_TEST_RESOURCE_DIR="documentation/src/test/resources" + local JUNIT5_TEST_RM=( + $(usev !migration-support example/IgnoredTestsDemo.java) + $(use !suite && echo \ + example/DocumentationTestSuite.java \ + example/SuiteDemo.java \ + ) + $(usev !vintage example/JUnit4Tests.java) + + # Need excluded module junit-platform-runner + example/JUnitPlatformClassDemo.java + example/JUnitPlatformSuiteDemo.java + + # Need excluded module junit-platform-testkit + example/testkit/ + + # Not necessary for the tests; some files even require extra dependency + org/junit/api/tools/ + + # Needs dev-java/hamcrest; no need to pull in extra dependency + # as the examples already provide ample tests to run + example/HamcrestAssertionsDemo.java + + # Makes an HTTP request and expects a certain response + example/session/HttpTests.java + ) + + pushd "${JUNIT5_TEST_SRC_DIR}" > /dev/null || + die "Failed to enter test source directory" + rm -rv "${JUNIT5_TEST_RM[@]}" || + die "Failed to remove unneeded test sources" + # Test sources expect the working directory to be 'documentation' + sed -i -e "s|src/test/resources|${JUNIT5_TEST_RESOURCE_DIR}|g" \ + example/ParameterizedTestDemo.java || + die "Failed to update file paths in test sources" + popd > /dev/null || die "Failed to leave test source directory" + + local test_dir="${T}/junit5_src_test" + local example_classes="${test_dir}/classes" + local test_classes="${test_dir}/test-classes" + mkdir -p "${example_classes}" "${test_classes}" || + die "Failed to create test directories" + + local example_sources="${test_dir}/sources.lst" + local test_sources="${test_dir}/test-sources.lst" + find documentation/src/main/java -type f -name '*.java' > "${example_sources}" || + die "Failed to get a list of example sources" + find documentation/src/test/java -type f -name '*.java' > "${test_sources}" || + die "Failed to get a list of test sources" + + ejavac -d "${example_classes}" -encoding "${JAVA_ENCODING}" \ + -classpath "$(junit5_gen_cp)" ${JAVAC_ARGS} \ + "@${example_sources}" + + local test_cp="${example_classes}:${JUNIT5_TEST_RESOURCE_DIR}:$(junit5_gen_cp)" + test_cp="${test_cp}:$(java-pkg_getjars --build-only --with-dependencies jimfs)" + ejavac -d "${test_classes}" -encoding "${JAVA_ENCODING}" \ + -classpath "${test_cp}" ${JAVAC_ARGS} \ + "@${test_sources}" + + set -- "$(java-config --java)" -classpath "${test_classes}:${test_cp}" \ + org.junit.platform.console.ConsoleLauncher \ + --disable-ansi-colors --fail-if-no-tests --scan-classpath \ + --include-classname='^(Test.*|.+[.$]Test.*|.*Tests?|.*Demo)$' \ + --exclude-tag="exclude" + echo "${@}" >&2 + "${@}" + local status="${?}" + [[ "${status}" -eq 2 ]] && die "JUnit did not discover any tests" + [[ "${status}" -eq 0 ]] || die "ConsoleLauncher failed" +} + +junit5_module_install() { + # It is OK to let java-pkg-simple_src_install call einstalldocs for + # each module as long as each documentation file being installed + # has a unique filename among _all_ modules; otherwise, some files + # would overwrite other ones. + if [[ -f README.md ]]; then + mv -v README.md "README-${module}.md" || + die "Failed to rename ${module}'s README.md" + fi + java-pkg-simple_src_install +} + +src_install() { + junit5_foreach_module junit5_module_install + einstalldocs # For project-global documentation + + if use doc; then + einfo "Installing Javadoc for all modules ..." + local apidoc="target/api" + java-pkg_dojavadoc "${apidoc}" + fi +} diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.9.2.ebuild index 6b6d656db44a..46efd8fcf0d8 100644 --- a/dev-java/junit/junit-5.9.2.ebuild +++ b/dev-java/junit/junit-5.9.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 @@ -11,7 +11,6 @@ EAPI=8 # installs each module's Javadoc to the same directory, which would # trigger an error when the second module's Javadoc is installed. JAVA_PKG_IUSE="source" -IUSE="doc migration-support suite vintage" inherit java-pkg-2 java-pkg-simple @@ -19,10 +18,11 @@ DESCRIPTION="Simple framework to write repeatable tests" HOMEPAGE="https://junit.org/junit5/" SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/junit5-r${PV}" - LICENSE="EPL-2.0" + SLOT="5" KEYWORDS="amd64 ~arm arm64 ppc64 x86" +IUSE="doc migration-support suite vintage" CP_DEPEND=" dev-java/apiguardian-api:0 diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index 2fe6b10adac3..10c371cdcac3 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -1,4 +1,3 @@ -DIST java17-riscv64.patch 2253475 BLAKE2B a10a257f0b8bf590cdc011cf0c5af4854d49d6bbdf68dd74b2f996b70e0ecdd2b87bc4a02394f67ded5e664efb41f8dd03bb312fbfcffd84c289afdcbf7868de SHA512 06230b121e1f28189877025a4eab99e6d8cba176a17c88f073498fec6c73ab26130ce1500ea4f83235cc6abbc1742e47b227d60b5ff77465740048abdc52d165 DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f2823772a5d9a18447a435f191daf78c5429a15c2e9ea64758dc9b26ee2a88275532b4f27714b2a7e4489f920c0ed2f5003b SHA512 c0426f243c5aa581d90366cb01ce811e34883a9d8a0298cab420378470e8eb427a56932ca1fbb5ed57e7430be2b38c6bc4491028ebaa25be0a938ba0bb2baf45 DIST openjdk-11.0.22_p7.tar.gz 116235391 BLAKE2B 50b845b8f1e316da37e45c94a1890939659b554a314a1a455903e8cc58465cd69cd485548b6b42c445150187e37df5cf946d52bca754236a198f6aa10d7de37e SHA512 b88d0db9750d8201dfb4b027045de4023be766e42cca7a3ff5e0cb28db4c6da3f146a57819a6b81cb33e5837726986bcc3780ecf88bf525f445c2cd35a3993d8 DIST openjdk-17.0.10_p7.tar.gz 106398664 BLAKE2B 48cb2bc7d063da25a62834734ba4a887d26a27a8d84c535255df67419bf4f6d8b060c48ef37bd7324e14e957a141791380d4d9e42335a90f72dc34bc7b1d12fe SHA512 c2dfd66debdce488de044efcfc3f57cc9eb07ead2cfb7dd6e28e5748d48ec89f0c326a4c3f4a5c740019b8e5a02b858d93dd74a0c6626de445144b9840d3a426 diff --git a/dev-java/openjdk/openjdk-17.0.10_p7.ebuild b/dev-java/openjdk/openjdk-17.0.10_p7.ebuild index a54d350af017..0b834a1a41a4 100644 --- a/dev-java/openjdk/openjdk-17.0.10_p7.ebuild +++ b/dev-java/openjdk/openjdk-17.0.10_p7.ebuild @@ -46,10 +46,7 @@ SRC_URI=" $(bootstrap_uri x86 ${X86_XPAK}) $(bootstrap_uri riscv ${RISCV_XPAK}) ) - riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch ) " -# riscv patch origin: -# https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch LICENSE="GPL-2-with-classpath-exception" KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86" @@ -163,7 +160,6 @@ pkg_setup() { } src_prepare() { - use riscv && eapply "${DISTDIR}"/java17-riscv64.patch default chmod +x configure || die } @@ -231,8 +227,6 @@ src_configure() { $(tc-is-clang && echo "--with-toolchain-type=clang") ) - use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" ) - use lto && myconf+=( --with-jvm-features=link-time-opt ) if use javafx; then diff --git a/dev-java/openjdk/openjdk-8.402_p06-r1.ebuild b/dev-java/openjdk/openjdk-8.402_p06-r1.ebuild deleted file mode 100644 index 902c433e73dd..000000000000 --- a/dev-java/openjdk/openjdk-8.402_p06-r1.ebuild +++ /dev/null @@ -1,280 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs - -# don't change versioning scheme -# to find correct _p number, look at -# https://github.com/openjdk/jdk${SLOT}u/tags -# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point -# to exact same commit sha. we should always use the full version. -# -ga tag is just for humans to easily identify General Availability release tag. -# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to -# set build version properly -MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)" -SLOT="${PV%%[.+]*}" - -# variable name format: _XPAK -X86_XPAK="8.402_p06" - -# Usage: bootstrap_uri [extracond] -# Example: $(bootstrap_uri x86 8.402_p06) -# Output: ppc64? ( big-endian? ( https://...8.402_p06-x86.tar.xz ) ) -bootstrap_uri() { - local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap" - local suff="tar.xz" - local kw="${1:?${FUNCNAME[0]}: keyword not specified}" - local ver="${2:?${FUNCNAME[0]}: version not specified}" - local cond="${3-}" - - # here be dragons - echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })" -} - -DESCRIPTION="Open source implementation of the Java programming language" -HOMEPAGE="https://openjdk.org" -SRC_URI=" - https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz - -> ${P}.tar.gz - !system-bootstrap? ( - $(bootstrap_uri x86 ${X86_XPAK}) - ) -" - -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="amd64 arm64 ppc64 x86" -IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source" - -COMMON_DEPEND=" - media-libs/freetype:2= - media-libs/giflib:0/7 - sys-libs/zlib -" -# Many libs are required to build, but not to run, make is possible to remove -# by listing conditionally in RDEPEND unconditionally in DEPEND -RDEPEND=" - ${COMMON_DEPEND} - >=sys-apps/baselayout-java-0.1.0-r1 - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) -" - -DEPEND=" - ${COMMON_DEPEND} - app-arch/zip - media-libs/alsa-lib - net-print/cups - virtual/pkgconfig - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - || ( - dev-java/openjdk-bin:${SLOT} - dev-java/openjdk:${SLOT} - ) -" - -BDEPEND=" - virtual/pkgconfig -" - -PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )" - -S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}" - -PATCHES=( - "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" - "${FILESDIR}/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch" - "${FILESDIR}/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch" - "${FILESDIR}/openjdk-8.402_p06-0003-Fix-negative-value-left-shift.patch" - "${FILESDIR}/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch" -) - -# The space required to build varies wildly depending on USE flags, -# ranging from 2GB to 16GB. This function is certainly not exact but -# should be close enough to be useful. -openjdk_check_requirements() { - local M - M=2048 - M=$(( $(usex debug 3 1) * $M )) - M=$(( $(usex jbootstrap 2 1) * $M )) - M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) - - CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - openjdk_check_requirements - if [[ ${MERGE_TYPE} != binary ]]; then - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" - fi -} - -pkg_setup() { - openjdk_check_requirements - java-vm-2_pkg_setup - - [[ ${MERGE_TYPE} == "binary" ]] && return - - JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" - JAVA_PKG_WANT_SOURCE="${SLOT}" - JAVA_PKG_WANT_TARGET="${SLOT}" - - if use system-bootstrap; then - for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then - java-pkg-2_pkg_setup - return - fi - done - fi -} - -src_prepare() { - default - - # new warnings in new gcc https://bugs.gentoo.org/685426 - sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \ - hotspot/make/linux/makefiles/gcc.make || die - - chmod +x configure || die -} - -src_configure() { - if ! use system-bootstrap; then - local xpakvar="${ARCH^^}_XPAK" - export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" - fi - - # general build info found here: - # https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html - - # -Wregister use (bug #918655) - append-cxxflags -std=gnu++14 - - # Work around stack alignment issue, bug #647954. - use x86 && append-flags -mincoming-stack-boundary=2 - - # Strip some flags users may set, but should not. #818502 - filter-flags -fexceptions - - # Strip lto related flags, no support in this version. - # https://bugs.gentoo.org/833097 - # https://bugs.gentoo.org/833098 - filter-lto - filter-flags -fdevirtualize-at-ltrans - - tc-export_build_env CC CXX PKG_CONFIG STRIP - - local myconf=( - --disable-ccache - --disable-freetype-bundling - --disable-precompiled-headers - --enable-unlimited-crypto - --with-boot-jdk="${JDK_HOME}" - --with-extra-cflags="${CFLAGS}" - --with-extra-cxxflags="${CXXFLAGS}" - --with-extra-ldflags="${LDFLAGS}" - --with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )" - --with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2" - --with-giflib="${XPAK_BOOTSTRAP:-system}" - --with-jtreg=no - --with-jobs=1 - --with-num-cores=1 - --with-update-version="$(ver_cut 2)" - --with-build-number="b$(ver_cut 4)" - --with-milestone="fcs" # magic variable that means "release version" - --with-vendor-name="Gentoo" - --with-vendor-url="https://gentoo.org" - --with-vendor-bug-url="https://bugs.gentoo.org" - --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" - --with-zlib="${XPAK_BOOTSTRAP:-system}" - --with-native-debug-symbols=$(usex debug internal none) - $(usex headless-awt --disable-headful '') - $(tc-is-clang && echo "--with-toolchain-type=clang") - ) - - ( - unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS - CFLAGS= CXXFLAGS= LDFLAGS= \ - CONFIG_SITE=/dev/null \ - CONFIG_SHELL="${BROOT}/bin/bash" - econf "${myconf[@]}" - ) -} - -src_compile() { - # Too brittle - gets confused by e.g. -Oline - export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)" - unset GNUMAKEFLAGS MAKEFLAGS - - local myemakeargs=( - JOBS=$(makeopts_jobs) - LOG=debug - CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror - NICE= # Use PORTAGE_NICENESS, don't adjust further down - $(usex doc docs '') - $(usex jbootstrap bootcycle-images images) - ) - emake "${myemakeargs[@]}" -j1 -} - -src_install() { - local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}/${dest#/}" - - cd "${S}"/build/*-release/images/j2sdk-image || die - - if ! use alsa; then - rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die - fi - - # build system does not remove that - if use headless-awt ; then - rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \ - {,jre/}bin/policytool bin/appletviewer || die - fi - - if ! use examples ; then - rm -vr demo/ || die - fi - - if ! use source ; then - rm -v src.zip || die - fi - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts - - java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh - java-vm_set-pax-markings "${ddest}" - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter - - if use doc ; then - docinto html - dodoc -r "${S}"/build/*-release/docs/* - fi -} - -pkg_postinst() { - java-vm-2_pkg_postinst - einfo "JavaWebStart functionality provided by icedtea-web package" -} diff --git a/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild b/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild new file mode 100644 index 000000000000..2b9037da0174 --- /dev/null +++ b/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild @@ -0,0 +1,282 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs + +# don't change versioning scheme +# to find correct _p number, look at +# https://github.com/openjdk/jdk${SLOT}u/tags +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point +# to exact same commit sha. we should always use the full version. +# -ga tag is just for humans to easily identify General Availability release tag. +# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to +# set build version properly +MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)" +SLOT="${PV%%[.+]*}" + +# variable name format: _XPAK +X86_XPAK="8.402_p06" + +# Usage: bootstrap_uri [extracond] +# Example: $(bootstrap_uri x86 8.402_p06) +# Output: ppc64? ( big-endian? ( https://...8.402_p06-x86.tar.xz ) ) +bootstrap_uri() { + local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap" + local suff="tar.xz" + local kw="${1:?${FUNCNAME[0]}: keyword not specified}" + local ver="${2:?${FUNCNAME[0]}: version not specified}" + local cond="${3-}" + + # here be dragons + echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })" +} + +DESCRIPTION="Open source implementation of the Java programming language" +HOMEPAGE="https://openjdk.org" +SRC_URI=" + https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz + -> ${P}.tar.gz + !system-bootstrap? ( + $(bootstrap_uri x86 ${X86_XPAK}) + ) +" + +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="amd64 arm64 ppc64 x86" +IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source" + +COMMON_DEPEND=" + media-libs/freetype:2= + media-libs/giflib:0/7 + sys-libs/zlib +" +# Many libs are required to build, but not to run, make is possible to remove +# by listing conditionally in RDEPEND unconditionally in DEPEND +RDEPEND=" + ${COMMON_DEPEND} + >=sys-apps/baselayout-java-0.1.0-r1 + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) +" + +DEPEND=" + ${COMMON_DEPEND} + app-arch/zip + media-libs/alsa-lib + net-print/cups + virtual/pkgconfig + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + system-bootstrap? ( + || ( + dev-java/openjdk-bin:${SLOT} + dev-java/openjdk:${SLOT} + ) + ) +" + +BDEPEND=" + virtual/pkgconfig +" + +PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )" + +S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}" + +PATCHES=( + "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" + "${FILESDIR}/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch" + "${FILESDIR}/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch" + "${FILESDIR}/openjdk-8.402_p06-0003-Fix-negative-value-left-shift.patch" + "${FILESDIR}/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch" +) + +# The space required to build varies wildly depending on USE flags, +# ranging from 2GB to 16GB. This function is certainly not exact but +# should be close enough to be useful. +openjdk_check_requirements() { + local M + M=2048 + M=$(( $(usex debug 3 1) * $M )) + M=$(( $(usex jbootstrap 2 1) * $M )) + M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) + + CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} +} + +pkg_pretend() { + openjdk_check_requirements + if [[ ${MERGE_TYPE} != binary ]]; then + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" + fi +} + +pkg_setup() { + openjdk_check_requirements + java-vm-2_pkg_setup + + [[ ${MERGE_TYPE} == "binary" ]] && return + + JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" + JAVA_PKG_WANT_SOURCE="${SLOT}" + JAVA_PKG_WANT_TARGET="${SLOT}" + + if use system-bootstrap; then + for vm in ${JAVA_PKG_WANT_BUILD_VM}; do + if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then + java-pkg-2_pkg_setup + return + fi + done + fi +} + +src_prepare() { + default + + # new warnings in new gcc https://bugs.gentoo.org/685426 + sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \ + hotspot/make/linux/makefiles/gcc.make || die + + chmod +x configure || die +} + +src_configure() { + if ! use system-bootstrap; then + local xpakvar="${ARCH^^}_XPAK" + export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" + fi + + # general build info found here: + # https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html + + # -Wregister use (bug #918655) + append-cxxflags -std=gnu++14 + + # Work around stack alignment issue, bug #647954. + use x86 && append-flags -mincoming-stack-boundary=2 + + # Strip some flags users may set, but should not. #818502 + filter-flags -fexceptions + + # Strip lto related flags, no support in this version. + # https://bugs.gentoo.org/833097 + # https://bugs.gentoo.org/833098 + filter-lto + filter-flags -fdevirtualize-at-ltrans + + tc-export_build_env CC CXX PKG_CONFIG STRIP + + local myconf=( + --disable-ccache + --disable-freetype-bundling + --disable-precompiled-headers + --enable-unlimited-crypto + --with-boot-jdk="${JDK_HOME}" + --with-extra-cflags="${CFLAGS}" + --with-extra-cxxflags="${CXXFLAGS}" + --with-extra-ldflags="${LDFLAGS}" + --with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )" + --with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2" + --with-giflib="${XPAK_BOOTSTRAP:-system}" + --with-jtreg=no + --with-jobs=1 + --with-num-cores=1 + --with-update-version="$(ver_cut 2)" + --with-build-number="b$(ver_cut 4)" + --with-milestone="fcs" # magic variable that means "release version" + --with-vendor-name="Gentoo" + --with-vendor-url="https://gentoo.org" + --with-vendor-bug-url="https://bugs.gentoo.org" + --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" + --with-zlib="${XPAK_BOOTSTRAP:-system}" + --with-native-debug-symbols=$(usex debug internal none) + $(usex headless-awt --disable-headful '') + $(tc-is-clang && echo "--with-toolchain-type=clang") + ) + + ( + unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS + CFLAGS= CXXFLAGS= LDFLAGS= \ + CONFIG_SITE=/dev/null \ + CONFIG_SHELL="${BROOT}/bin/bash" + econf "${myconf[@]}" + ) +} + +src_compile() { + # Too brittle - gets confused by e.g. -Oline + export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)" + unset GNUMAKEFLAGS MAKEFLAGS + + local myemakeargs=( + JOBS=$(makeopts_jobs) + LOG=debug + CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror + NICE= # Use PORTAGE_NICENESS, don't adjust further down + $(usex doc docs '') + $(usex jbootstrap bootcycle-images images) + ) + emake "${myemakeargs[@]}" -j1 +} + +src_install() { + local dest="/usr/$(get_libdir)/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + cd "${S}"/build/*-release/images/j2sdk-image || die + + if ! use alsa; then + rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die + fi + + # build system does not remove that + if use headless-awt ; then + rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \ + {,jre/}bin/policytool bin/appletviewer || die + fi + + if ! use examples ; then + rm -vr demo/ || die + fi + + if ! use source ; then + rm -v src.zip || die + fi + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts + + java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh + java-vm_set-pax-markings "${ddest}" + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter + + if use doc ; then + docinto html + dodoc -r "${S}"/build/*-release/docs/* + fi +} + +pkg_postinst() { + java-vm-2_pkg_postinst + einfo "JavaWebStart functionality provided by icedtea-web package" +} diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest index e2316fb43d36..97b63d254284 100644 --- a/dev-java/scala-cli-bin/Manifest +++ b/dev-java/scala-cli-bin/Manifest @@ -2,11 +2,14 @@ DIST scala-cli-amd64-1.0.4.gz 33291617 BLAKE2B bd97626e7e95fb6b2a82fd424673078b8 DIST scala-cli-amd64-1.1.0.gz 33673708 BLAKE2B 332f5a974949af49914de8fdb3129b0937fbce842616d6fefe16f7aff89baf6be1ba536d0ee6ff9bc1dd2b5ebfa51943bd0c6279ef83b95bd25a337530fa1295 SHA512 ba7ebb321a27e95f786027257c3f50dac1d12e0cc33abde24dc7c5dffb2f57a11c3ea67d92ed487968c49ff9ec3eaf5d1d62065beda5b6fa373d09b9126f4529 DIST scala-cli-amd64-1.1.1.gz 33754319 BLAKE2B 91fb5e9b828a2c6c6dd984b421bb101ea1ae03c85d94eda14ba79433d29a88cb2850cb376c212f677c1b8167a0a21b320aeb0e4e63a29e6c8502d76babc1543d SHA512 1e0cd5eee280e208090961e4b6d216d472fef360f13e0f4e28412b9a52883d65c97e3fe70c8ce5cf96e6cd866f14b175454175be9df3bdc5c229fb2f121c925a DIST scala-cli-amd64-1.2.1.gz 33851353 BLAKE2B 31c92901f970ec2c0a74cb45d94b98e6d8f282c175cf8deb1a806db4b6d2e9a8b2150bca9fc9e373948e5092bf4bb7d5d1145a133d3b1c234d3cbe383ff9a270 SHA512 169c81bee582c6144501e8bd5436bae0bd3447ed89856a4d4763d13d3083ad26d948729b71bea864986f2c676e50855b8fb036d3a69ed0a316e2c6af0f98ef5f +DIST scala-cli-amd64-1.2.2.gz 33871512 BLAKE2B ef9328b26afb52ada07739539d560239d6ce2ffd72d1e353ce94d45c7358b6789aa0019804e249584ca497d5d15c96caab12eb31fab5b84a14162c00ca30c181 SHA512 02da0915ee140a129f622f973291c98c7dd7b7f16f5a2a5250ac825e09876b616a315fe5e6af43691f43870fa68234efeff73eadd4f6060d2d90fe937302eae7 DIST scala-cli-arm64-1.0.4.gz 33185346 BLAKE2B 2b0131a56ed3f67fb5d5f25db6c511dc7d9e9128089e6826fa7d859b1457f03a99e290cc63f185820ea849a857f40d667d5db7a378dabcf545cdcdefded6a577 SHA512 3ff1c025a1035aa6a8550de17e85bc5c483007d5f07f03e0d792d6dc9ed1b18eb26909b3c7195fde12056a3b84ffa69dc53c01ec21b34187c1d7188a0a023aaa DIST scala-cli-arm64-1.1.0.gz 33575885 BLAKE2B ebccbe86044b4708a356060a16f06bb94df01d261ab7dabe8eba8e644c121864cdee99debf95468d936cbff670413ec47e1ef903a9071b267a61c5fe46738c1a SHA512 6a85529be06a8d43d729c5a795bb0dcdb2680bd7ef3de471fee908e91249401262e8322019c640d4eb45d0a15ed0073ff51b24d61846228f46c36bfb48731408 DIST scala-cli-arm64-1.1.1.gz 33656505 BLAKE2B b943f370c9375fec5cec3c63628ecd9e416b569ec2d692422f217b2506c104a1c3bb415569581d68c9476bf892b4a087e7b95b2310955dd0f9af52edc90af2e9 SHA512 79836261613bafe4710c1d904ec39e88c1862b3021f7b37ac5004c6079c762e68550522fbb7240e48e7408f844f648ab92c12cb568ebc63bb3e01f1992a7eaf3 DIST scala-cli-arm64-1.2.1.gz 33769006 BLAKE2B 4bc2c830d17e235a3eba7029bfd018ee4cd12f8ee27a3574b1c2195ab8ad22b79c452a0660fb55f1be99a610be1f4ea38f8e2de622f10277be7f5403b540778a SHA512 90a8f6b4ae2fa90dcdd3c88fdbbd1079db1cbbde80f496da8663223ad79dc4b499b6ae43835067d8fde945d4fb5ed079dec850f688b9d1b62602d186d426f7cb +DIST scala-cli-arm64-1.2.2.gz 33766128 BLAKE2B d5b2d7ab8157f3874b1cfe0b0647ab30f5dd191337e575056eb758d52eda30871c54b20a08a1cda3e28c51afd744b4b8320aee6aef056b39b98f2534184739ba SHA512 004ca188e4ddd01c0e46277fa514b1c9bd061ea26d4318b8daff3ffaae5bb7cc9f4746509401da19774537c7e56f8a5a7da846cd4b5f90c61a3ab1f8d3ed0493 DIST scala-cli-non-native-1.0.4 7553232 BLAKE2B 9299b20dddec80d12e738af4b283e816de5bae23262510146cd33a9b175f2a343f52932fbd3254974bd4219d2903f32772409f234423d3a027b6b0f02268e584 SHA512 4e5281ef7f8a886ad79746477d852f485ccad317568a64ee513e691dcd9a9121c2aed51f6170b959f0226fb81efe9aa1f8ecf1d94a84a0b387c349adfb756762 DIST scala-cli-non-native-1.1.0 7728727 BLAKE2B 05deb93b91029721a21bac729aa9b370e05909e67bbade921e00d09c3a37e851e519188bff73dc614c3f5768834ae56f94623347735e756a6bcb0c4c81c8713c SHA512 13e426915794df757b6eb029d2545316bd9f4b9ba6f58cf59a546227d6997741cf681ce0c5e721e8e95cb9e420702f2d28f004df1780637dc9b39fd3bc4c884a DIST scala-cli-non-native-1.1.1 7779964 BLAKE2B 08849ce4a6fbf1e6eb2e4fafd2e29522e535c0795d6f1acbcd25ec4523d14dcae4a746f3729786db8f62a3770e6fdbd78a76477b182b32945454ac19a2f8217c SHA512 61c2a1a325f83e19102cd2f5d6b89d37b9914d64f86da6218258f064a6a8e5ab927d28b278363316446611e2cbdc8e4687616ea2b001da00ecbafb4207eabeb2 DIST scala-cli-non-native-1.2.1 7836408 BLAKE2B a7c191020a65a4420ef7cc9d8fe5f9c6d1548c1cfb14dea94c0d9a798f608c038083bb678bd1a4fbdc9bd3de58f02a11e970cfebec4ac755f7f12af21eeb4dbc SHA512 d889ad3fa96953423fc1d948b6e260f55ffc4234d6e9da05299afe0a6cbc2b66c42a7a65113f887d1bf41a699679d09e02aed6686150551d1e1171d7c1c7331b +DIST scala-cli-non-native-1.2.2 7837019 BLAKE2B 799ed83805ba767b687cf9a041a3e23f008e20e3ca55b8c52a9361c0b2465141abb7c17ca7dca59c9307af5a5a07a0cfe0d8035eea14a2adf2580913d67d6a10 SHA512 40aa43ee601c52238989a81884b6acc7a023599abb561bed1c9d31dff6053eff0f3477097a228bc30aab4df22d81b10fbbb64b5557d3067b4715c821c4eacb3e diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild new file mode 100644 index 000000000000..dc0659cfd5ec --- /dev/null +++ b/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 + +UPSTREAM_PV=${PV/_/-} +UPSTREAM_PV=${UPSTREAM_PV/rc/RC} + +DESCRIPTION="CLI to interact with Scala and Java" +HOMEPAGE="https://scala-cli.virtuslab.org/" +SRC_URI=" + !amd64? ( !arm64? ( + https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli + -> scala-cli-non-native-${UPSTREAM_PV} + ) ) + amd64? ( + https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz + -> scala-cli-amd64-${UPSTREAM_PV}.gz + ) + arm64? ( + https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz + -> scala-cli-arm64-${UPSTREAM_PV}.gz + ) +" + +KEYWORDS="~amd64 ~arm64" +LICENSE="Apache-2.0" +SLOT="0" + +S="${WORKDIR}" + +# A JRE is not strictly required if native images of scala-cli are used +# (amd64, arm64). However we may want a system JRE anyway, and having JRE +# in RDEPEND reduces the chances that scala-cli needs to install one +# for the user. +RDEPEND=" + >=virtual/jre-11 + sys-libs/zlib +" +BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )" + +QA_TEXTRELS="*" +QA_FLAGS_IGNORED="/usr/bin/scala-cli" + +src_prepare() { + default + + if use amd64; then + mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die + elif use arm64; then + mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die + else + mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die + fi + + chmod +x scala-cli || die +} + +src_compile() { + for shell in bash zsh; do + ./scala-cli install-completions \ + --shell ${shell} \ + --env \ + --output "${S}" \ + > ${shell}-completion || die + done +} + +src_install() { + dobin scala-cli + + newbashcomp bash-completion scala-cli + + insinto /usr/share/zsh/site-functions + doins zsh/_scala-cli +} diff --git a/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild index a927ad1ef0ad..d560c27c933d 100644 --- a/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild +++ b/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t )" S=${WORKDIR}/${P}-src/native -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" LICENSE="Apache-2.0" SLOT="0" IUSE="static-libs" diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz index da86610d13c8..a4f0108d660d 100644 Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ diff --git a/dev-lang/algol68g/Manifest b/dev-lang/algol68g/Manifest index ebce1904669e..7fb9b7c3a4cf 100644 --- a/dev-lang/algol68g/Manifest +++ b/dev-lang/algol68g/Manifest @@ -1,2 +1 @@ -DIST algol68g-3.4.6.tar.gz 661358 BLAKE2B 1a825534833f2b4ff4025c3ca2d2f022c1c78cf8f8a365cc12e97af1cc4994228b705d6395e5c967d6a195cd2fc542212025133e6410d4876d43c36952dc60c0 SHA512 831585cb90c524014cc199256dbcf663868b37804071774e2eac5c64944e25513df4584421042d02140ee2695a918caec9b99c837d117e775d3721bf09065fb4 DIST algol68g-3.5.1.tar.gz 661670 BLAKE2B ec0aa47f367af621f3cf8ebad81bd501bac31238b4a918943917fec4d9f66cf57f98f5bd4c4c02d315a8f1ac2fd789aafb6e331289fac417abf9301a2a5d339d SHA512 764038c7db567d5fc130d4c324b74f43d7dbcfd89efb7b12b1a6983314a7e13f17e105fa783fb3397fff3773b69699ca3f5fd3be873229db9bf91582f7bf52f4 diff --git a/dev-lang/algol68g/algol68g-3.4.6.ebuild b/dev-lang/algol68g/algol68g-3.4.6.ebuild deleted file mode 100644 index 3b5c40da8f55..000000000000 --- a/dev-lang/algol68g/algol68g-3.4.6.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Algol 68 Genie compiler-interpreter" -HOMEPAGE="https://jmvdveer.home.xs4all.nl/en.algol-68-genie.html" -SRC_URI="https://jmvdveer.home.xs4all.nl/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="+curl +gsl +mpfr +ncurses plotutils postgres +readline" - -RDEPEND=" - curl? ( net-misc/curl ) - gsl? ( sci-libs/gsl:= ) - mpfr? ( dev-libs/mpfr:= ) - plotutils? ( media-libs/plotutils ) - postgres? ( dev-db/postgresql:* ) - readline? ( sys-libs/readline:= ) -" -DEPEND=" - ${RDEPEND} -" - -PATCHES=( "${FILESDIR}/${PN}-3.3.21-configure-implicit.patch" ) - -src_configure() { - local -a myconf=( - $(use_enable curl) - $(use_enable gsl) - $(use_enable mpfr) - $(use_enable ncurses curses) - $(use_enable plotutils) - $(use_enable postgres postgresql) - $(use_enable readline) - $(use_with ncurses) - ) - econf "${myconf[@]}" -} diff --git a/dev-lang/boogie/Manifest b/dev-lang/boogie/Manifest index 5386b8f05e09..6cacf40b8881 100644 --- a/dev-lang/boogie/Manifest +++ b/dev-lang/boogie/Manifest @@ -1,8 +1,6 @@ -DIST boogie-3.0.11.tar.gz 2044740 BLAKE2B b8c1cde7ad4b10deabb9ca9edbf226f580512a3817e9a19a947c7bd5d26808c08e907237aad2209ec06e645fa7ef40c8d73fec812437585b27adf4e125d5b1a0 SHA512 fe59fb1ed2708a5d988a569dd14148e308966ca6382da8502a2c679d67121b39f60e03e9ed6f7efa80c079c818db008c99e1f5e6bc28ba617fe33ae6289c2cce -DIST boogie-3.0.12.tar.gz 2044818 BLAKE2B 0d11cb1288933b1046b46ea3b93336fe08b9897a4aaf42228971e280be2c648b2110d20aaf6533e6d95e51b0a86c1fe507da05eaa908dc0ed885192e9480d0e7 SHA512 e2c1d4faad1bb448dd3cd9f6dbd4c70fa913584ef1bedd4938298498850bc6a0b6017924a55d9b48c82189253c2ac8c84a2564afa2d9b237434ad40ea286fbec -DIST boogie-3.1.1.tar.gz 2038688 BLAKE2B ea720665dd9d830de0639b3b2fe08c452e80375e98b8ff9ced473c4beb540a2cb3908415bfbb1582edac9043c17dcbfc014d2dd1dcc3ce0877db436c13a639bd SHA512 704990ebd9b55e4f617249a5e2b4c74a615c61a51da41485eddd8c1b8159f16afd5da13e93f684a97d87c2e1273549977e04180423909c22b026e975d07a0ceb DIST boogie-3.1.2.tar.gz 2038757 BLAKE2B 5e20b8c4d02fb623a9b7ae053677ae148d1d5db8a3a7530088a56f25fed1708946ca9bf9f2509fecfe994963b65c52a83238870d5060e7a787d2330b2cf98628 SHA512 218dbdcc979de6d8fb871596906a5403935b9dd06b8ad74eab2face0c7a1d04946b692fbe635e23bbad4b0a9e74de6159c53c38069be627ab6a916a09050a282 DIST boogie-3.1.3.tar.gz 2038898 BLAKE2B 4a5604d6b00ca81393ccf37c542bfed3f3983453b1fd390fc466e37c7133030f1b453c61f2907bb399fe2891e134dcf3dc86b1ac562cd4ed34b634625320497d SHA512 2ae4bd267ea4636c4f52cb7aae0907db9b8411d6f19d35a9338237ef7820f6cf03ebe9939497fe34a646e8b1f69da0882a5765bcc1224bb8cdfd2a7f999d8862 +DIST boogie-3.1.4.tar.gz 2050762 BLAKE2B 01a8faa38a3a7d134d8f5d54f2b8e0a6a2a07b11d46469c8dbd65d80987e3292cd61937437321e6f79ab55895f6dbe5cfdf410d311f314ab7ed69f684a48d98b SHA512 76a9a4cb2ae2ac49db7fdbca049f797c1272b19e1a783541a74cd310b085c8bab5360fee4293d4f1478371ae26368751e2f658965023a4d7a7dc6b9d25489edb DIST microsoft.bcl.asyncinterfaces.6.0.0.nupkg 76354 BLAKE2B aca3f5db71e4037dbdd604aeaebcd0962ccc171915b77b4c409ab744bf0a469c7d588f9504fc7fa49e3863e9593b66b4083235cb49e812d1f87b3dadb32e6003 SHA512 221a05a0c910f7a87b620d8f3831ed392b4eb95d112bee274d35f27009ad2a26445de9d7cd235fe6fb4a03f2550874bda3be3dddd96edaf9c0852a9c23d7b099 DIST microsoft.codecoverage.16.2.0.nupkg 3133582 BLAKE2B 418cf403247d594cde0d827f8ca8690019a7631525f07993937085f4bbf8473364b4c99aea6e8b7b0020208d15fe0da63f0f4e69c273493c51ae011e8bd82667 SHA512 91f1d43fc038a20f5367d9aab669105dc7514dfbe749260b52789c09a75abcc6bdc000ee0c7f432231d4cc09e99bf5b863dd6289d813342f74d9dad23a651625 DIST microsoft.csharp.4.0.1.nupkg 462346 BLAKE2B 209ccebc9103b803d26ea1f0232245c3cd231078b03a83a0011a2a79a1a8a324a72c5b3fda94b2686fff170932f366e165f81a36a70df590a39c45d70778e4be SHA512 c0e75a9162f28ba4c4572c8fac4fd4c8c97d6d3505a37683646ba5f7e5f6ac0da69d5200d2646054de90e8e08f893a10e514591b69b8273640842b2cf90bddec diff --git a/dev-lang/boogie/boogie-3.0.11.ebuild b/dev-lang/boogie/boogie-3.0.11.ebuild deleted file mode 100644 index 86a1c4aef664..000000000000 --- a/dev-lang/boogie/boogie-3.0.11.ebuild +++ /dev/null @@ -1,300 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DOTNET_PKG_COMPAT=8.0 -NUGETS=" -microsoft.bcl.asyncinterfaces@6.0.0 -microsoft.codecoverage@16.2.0 -microsoft.csharp@4.0.1 -microsoft.dotnet.internalabstractions@1.0.0 -microsoft.net.test.sdk@16.2.0 -microsoft.netcore.platforms@1.0.1 -microsoft.netcore.platforms@1.1.0 -microsoft.netcore.targets@1.0.1 -microsoft.netcore.targets@1.1.0 -microsoft.testplatform.objectmodel@16.2.0 -microsoft.testplatform.testhost@16.2.0 -microsoft.win32.primitives@4.0.1 -microsoft.win32.primitives@4.3.0 -microsoft.win32.registry@4.0.0 -microsoft.win32.registry@4.3.0 -microsoft.win32.systemevents@6.0.0 -netstandard.library@1.6.0 -netstandard.library@2.0.0 -newtonsoft.json@9.0.1 -nunit@3.12.0 -nunit3testadapter@3.15.1 -runtime.any.system.collections@4.3.0 -runtime.any.system.diagnostics.tools@4.3.0 -runtime.any.system.diagnostics.tracing@4.3.0 -runtime.any.system.globalization.calendars@4.3.0 -runtime.any.system.globalization@4.3.0 -runtime.any.system.io@4.3.0 -runtime.any.system.reflection.extensions@4.3.0 -runtime.any.system.reflection.primitives@4.3.0 -runtime.any.system.reflection@4.3.0 -runtime.any.system.resources.resourcemanager@4.3.0 -runtime.any.system.runtime.handles@4.3.0 -runtime.any.system.runtime.interopservices@4.3.0 -runtime.any.system.runtime@4.3.0 -runtime.any.system.text.encoding.extensions@4.3.0 -runtime.any.system.text.encoding@4.3.0 -runtime.any.system.threading.tasks@4.3.0 -runtime.any.system.threading.timer@4.3.0 -runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.native.system.io.compression@4.1.0 -runtime.native.system.net.http@4.0.1 -runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.native.system.security.cryptography@4.0.0 -runtime.native.system@4.0.0 -runtime.native.system@4.3.0 -runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.unix.microsoft.win32.primitives@4.3.0 -runtime.unix.system.console@4.3.0 -runtime.unix.system.diagnostics.debug@4.3.0 -runtime.unix.system.io.filesystem@4.3.0 -runtime.unix.system.net.primitives@4.3.0 -runtime.unix.system.net.sockets@4.3.0 -runtime.unix.system.private.uri@4.3.0 -runtime.unix.system.runtime.extensions@4.3.0 -system.appcontext@4.1.0 -system.buffers@4.0.0 -system.buffers@4.3.0 -system.collections.concurrent@4.0.12 -system.collections.immutable@1.2.0 -system.collections.nongeneric@4.0.1 -system.collections.nongeneric@4.3.0 -system.collections.specialized@4.0.1 -system.collections.specialized@4.3.0 -system.collections@4.0.11 -system.collections@4.3.0 -system.componentmodel.eventbasedasync@4.0.11 -system.componentmodel.eventbasedasync@4.3.0 -system.componentmodel.primitives@4.1.0 -system.componentmodel.primitives@4.3.0 -system.componentmodel.typeconverter@4.1.0 -system.componentmodel.typeconverter@4.3.0 -system.componentmodel@4.0.1 -system.componentmodel@4.3.0 -system.configuration.configurationmanager@6.0.0 -system.console@4.0.0 -system.diagnostics.debug@4.0.11 -system.diagnostics.debug@4.3.0 -system.diagnostics.diagnosticsource@4.0.0 -system.diagnostics.process@4.1.0 -system.diagnostics.process@4.3.0 -system.diagnostics.textwritertracelistener@4.0.0 -system.diagnostics.tools@4.0.1 -system.diagnostics.tracesource@4.0.0 -system.diagnostics.tracing@4.1.0 -system.diagnostics.tracing@4.3.0 -system.drawing.common@6.0.0 -system.dynamic.runtime@4.0.11 -system.globalization.calendars@4.0.1 -system.globalization.extensions@4.0.1 -system.globalization.extensions@4.3.0 -system.globalization@4.0.11 -system.globalization@4.3.0 -system.io.compression.zipfile@4.0.1 -system.io.compression@4.1.0 -system.io.filesystem.primitives@4.0.1 -system.io.filesystem.primitives@4.3.0 -system.io.filesystem@4.0.1 -system.io.filesystem@4.3.0 -system.io@4.1.0 -system.io@4.3.0 -system.linq.async@6.0.1 -system.linq.expressions@4.1.0 -system.linq@4.1.0 -system.linq@4.3.0 -system.net.http@4.1.0 -system.net.nameresolution@4.3.0 -system.net.primitives@4.0.11 -system.net.sockets@4.1.0 -system.objectmodel@4.0.12 -system.private.datacontractserialization@4.1.1 -system.private.uri@4.3.0 -system.reactive@4.4.1 -system.reflection.emit.ilgeneration@4.0.1 -system.reflection.emit.lightweight@4.0.1 -system.reflection.emit@4.0.1 -system.reflection.extensions@4.0.1 -system.reflection.extensions@4.3.0 -system.reflection.metadata@1.3.0 -system.reflection.primitives@4.0.1 -system.reflection.primitives@4.3.0 -system.reflection.typeextensions@4.1.0 -system.reflection.typeextensions@4.3.0 -system.reflection@4.1.0 -system.reflection@4.3.0 -system.resources.resourcemanager@4.0.1 -system.resources.resourcemanager@4.3.0 -system.runtime.caching@6.0.0 -system.runtime.extensions@4.1.0 -system.runtime.extensions@4.3.0 -system.runtime.handles@4.0.1 -system.runtime.handles@4.3.0 -system.runtime.interopservices.runtimeinformation@4.0.0 -system.runtime.interopservices.runtimeinformation@4.3.0 -system.runtime.interopservices@4.1.0 -system.runtime.interopservices@4.3.0 -system.runtime.loader@4.0.0 -system.runtime.numerics@4.0.1 -system.runtime.serialization.json@4.0.2 -system.runtime.serialization.primitives@4.1.1 -system.runtime@4.1.0 -system.runtime@4.3.0 -system.security.accesscontrol@6.0.0 -system.security.claims@4.3.0 -system.security.cryptography.algorithms@4.2.0 -system.security.cryptography.cng@4.2.0 -system.security.cryptography.csp@4.0.0 -system.security.cryptography.encoding@4.0.0 -system.security.cryptography.openssl@4.0.0 -system.security.cryptography.primitives@4.0.0 -system.security.cryptography.protecteddata@6.0.0 -system.security.cryptography.x509certificates@4.1.0 -system.security.permissions@6.0.0 -system.security.principal.windows@4.3.0 -system.security.principal@4.3.0 -system.text.encoding.extensions@4.0.11 -system.text.encoding.extensions@4.3.0 -system.text.encoding@4.0.11 -system.text.encoding@4.3.0 -system.text.regularexpressions@4.1.0 -system.text.regularexpressions@4.3.0 -system.threading.tasks.extensions@4.0.0 -system.threading.tasks.extensions@4.3.0 -system.threading.tasks@4.0.11 -system.threading.tasks@4.3.0 -system.threading.thread@4.0.0 -system.threading.thread@4.3.0 -system.threading.threadpool@4.0.10 -system.threading.threadpool@4.3.0 -system.threading.timer@4.0.1 -system.threading@4.0.11 -system.threading@4.3.0 -system.windows.extensions@6.0.0 -system.xml.readerwriter@4.0.11 -system.xml.readerwriter@4.3.0 -system.xml.xdocument@4.0.11 -system.xml.xmldocument@4.0.1 -system.xml.xmldocument@4.3.0 -system.xml.xmlserializer@4.0.11 -system.xml.xpath.xmldocument@4.0.1 -system.xml.xpath.xmldocument@4.3.0 -system.xml.xpath@4.0.1 -system.xml.xpath@4.3.0 -" - -inherit check-reqs dotnet-pkg edo multiprocessing - -DESCRIPTION="SMT-based program verifier" -HOMEPAGE="https://github.com/boogie-org/boogie/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/boogie-org/${PN}.git" -else - SRC_URI="https://github.com/boogie-org/${PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - - KEYWORDS="amd64" -fi - -SRC_URI+=" ${NUGET_URIS} " - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - sci-mathematics/z3 -" -BDEPEND=" - ${RDEPEND} - test? ( - dev-python/lit - dev-python/OutputCheck - ) -" - -PATCHES=( "${FILESDIR}/${PN}-3.0.4-disable-analyzers.patch" ) - -CHECKREQS_DISK_BUILD="2G" -DOTNET_PKG_PROJECTS=( Source/BoogieDriver/BoogieDriver.csproj ) -DOTNET_PKG_BUILD_EXTRA_ARGS=( -p:RollForward=Major ) - -pkg_setup() { - check-reqs_pkg_setup - dotnet-pkg_pkg_setup -} - -src_unpack() { - dotnet-pkg_src_unpack - - if [[ -n "${EGIT_REPO_URI}" ]] ; then - git-r3_src_unpack - fi -} - -src_prepare() { - # Remove bad tests. - local -a bad_tests=( - civl/inductive-sequentialization/BroadcastConsensus.bpl - civl/inductive-sequentialization/PingPong.bpl - civl/inductive-sequentialization/paxos/is.sh - livevars/bla1.bpl - prover/cvc5-offline.bpl - prover/cvc5.bpl - prover/exitcode.bpl - prover/z3-hard-timeout.bpl - prover/z3mutl.bpl - test0/MaxKeepGoingSplits.bpl - test15/CaptureInlineUnroll.bpl - test15/CaptureState.bpl - test15/CommonVariablesPruning.bpl - test21/InterestingExamples4.bpl - test21/issue-735.bpl - ) - local bad_test - for bad_test in "${bad_tests[@]}" ; do - rm "${S}/Test/${bad_test}" || die - done - - # Update the boogieBinary variable. - sed "/^boogieBinary/s|= .*|= '${DOTNET_PKG_OUTPUT}/BoogieDriver.dll'|" \ - -i "${S}/Test/lit.site.cfg" || die "failed to update lit.site.cfg" - - dotnet-pkg_src_prepare -} - -src_test() { - einfo "Starting tests using the lit test tool." - local -a lit_opts=( - --order=lexical - --time-tests - --verbose - --workers="$(makeopts_jobs)" - ) - edob lit "${lit_opts[@]}" "${S}/Test" -} - -src_install() { - dotnet-pkg-base_install - dotnet-pkg-base_dolauncher "/usr/share/${P}/BoogieDriver" boogie - - einstalldocs -} diff --git a/dev-lang/boogie/boogie-3.0.12.ebuild b/dev-lang/boogie/boogie-3.0.12.ebuild deleted file mode 100644 index af645fd84b5b..000000000000 --- a/dev-lang/boogie/boogie-3.0.12.ebuild +++ /dev/null @@ -1,296 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DOTNET_PKG_COMPAT=8.0 -NUGETS=" -microsoft.bcl.asyncinterfaces@6.0.0 -microsoft.codecoverage@16.2.0 -microsoft.csharp@4.0.1 -microsoft.dotnet.internalabstractions@1.0.0 -microsoft.net.test.sdk@16.2.0 -microsoft.netcore.platforms@1.0.1 -microsoft.netcore.platforms@1.1.0 -microsoft.netcore.targets@1.0.1 -microsoft.netcore.targets@1.1.0 -microsoft.testplatform.objectmodel@16.2.0 -microsoft.testplatform.testhost@16.2.0 -microsoft.win32.primitives@4.0.1 -microsoft.win32.primitives@4.3.0 -microsoft.win32.registry@4.0.0 -microsoft.win32.registry@4.3.0 -microsoft.win32.systemevents@6.0.0 -netstandard.library@1.6.0 -netstandard.library@2.0.0 -newtonsoft.json@9.0.1 -nunit@3.12.0 -nunit3testadapter@3.15.1 -runtime.any.system.collections@4.3.0 -runtime.any.system.diagnostics.tools@4.3.0 -runtime.any.system.diagnostics.tracing@4.3.0 -runtime.any.system.globalization.calendars@4.3.0 -runtime.any.system.globalization@4.3.0 -runtime.any.system.io@4.3.0 -runtime.any.system.reflection.extensions@4.3.0 -runtime.any.system.reflection.primitives@4.3.0 -runtime.any.system.reflection@4.3.0 -runtime.any.system.resources.resourcemanager@4.3.0 -runtime.any.system.runtime.handles@4.3.0 -runtime.any.system.runtime.interopservices@4.3.0 -runtime.any.system.runtime@4.3.0 -runtime.any.system.text.encoding.extensions@4.3.0 -runtime.any.system.text.encoding@4.3.0 -runtime.any.system.threading.tasks@4.3.0 -runtime.any.system.threading.timer@4.3.0 -runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.native.system.io.compression@4.1.0 -runtime.native.system.net.http@4.0.1 -runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.native.system.security.cryptography@4.0.0 -runtime.native.system@4.0.0 -runtime.native.system@4.3.0 -runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.unix.microsoft.win32.primitives@4.3.0 -runtime.unix.system.console@4.3.0 -runtime.unix.system.diagnostics.debug@4.3.0 -runtime.unix.system.io.filesystem@4.3.0 -runtime.unix.system.net.primitives@4.3.0 -runtime.unix.system.net.sockets@4.3.0 -runtime.unix.system.private.uri@4.3.0 -runtime.unix.system.runtime.extensions@4.3.0 -system.appcontext@4.1.0 -system.buffers@4.0.0 -system.buffers@4.3.0 -system.collections.concurrent@4.0.12 -system.collections.immutable@1.2.0 -system.collections.nongeneric@4.0.1 -system.collections.nongeneric@4.3.0 -system.collections.specialized@4.0.1 -system.collections.specialized@4.3.0 -system.collections@4.0.11 -system.collections@4.3.0 -system.componentmodel.eventbasedasync@4.0.11 -system.componentmodel.eventbasedasync@4.3.0 -system.componentmodel.primitives@4.1.0 -system.componentmodel.primitives@4.3.0 -system.componentmodel.typeconverter@4.1.0 -system.componentmodel.typeconverter@4.3.0 -system.componentmodel@4.0.1 -system.componentmodel@4.3.0 -system.configuration.configurationmanager@6.0.0 -system.console@4.0.0 -system.diagnostics.debug@4.0.11 -system.diagnostics.debug@4.3.0 -system.diagnostics.diagnosticsource@4.0.0 -system.diagnostics.process@4.1.0 -system.diagnostics.process@4.3.0 -system.diagnostics.textwritertracelistener@4.0.0 -system.diagnostics.tools@4.0.1 -system.diagnostics.tracesource@4.0.0 -system.diagnostics.tracing@4.1.0 -system.diagnostics.tracing@4.3.0 -system.drawing.common@6.0.0 -system.dynamic.runtime@4.0.11 -system.globalization.calendars@4.0.1 -system.globalization.extensions@4.0.1 -system.globalization.extensions@4.3.0 -system.globalization@4.0.11 -system.globalization@4.3.0 -system.io.compression.zipfile@4.0.1 -system.io.compression@4.1.0 -system.io.filesystem.primitives@4.0.1 -system.io.filesystem.primitives@4.3.0 -system.io.filesystem@4.0.1 -system.io.filesystem@4.3.0 -system.io@4.1.0 -system.io@4.3.0 -system.linq.async@6.0.1 -system.linq.expressions@4.1.0 -system.linq@4.1.0 -system.linq@4.3.0 -system.net.http@4.1.0 -system.net.nameresolution@4.3.0 -system.net.primitives@4.0.11 -system.net.sockets@4.1.0 -system.objectmodel@4.0.12 -system.private.datacontractserialization@4.1.1 -system.private.uri@4.3.0 -system.reactive@4.4.1 -system.reflection.emit.ilgeneration@4.0.1 -system.reflection.emit.lightweight@4.0.1 -system.reflection.emit@4.0.1 -system.reflection.extensions@4.0.1 -system.reflection.extensions@4.3.0 -system.reflection.metadata@1.3.0 -system.reflection.primitives@4.0.1 -system.reflection.primitives@4.3.0 -system.reflection.typeextensions@4.1.0 -system.reflection.typeextensions@4.3.0 -system.reflection@4.1.0 -system.reflection@4.3.0 -system.resources.resourcemanager@4.0.1 -system.resources.resourcemanager@4.3.0 -system.runtime.caching@6.0.0 -system.runtime.extensions@4.1.0 -system.runtime.extensions@4.3.0 -system.runtime.handles@4.0.1 -system.runtime.handles@4.3.0 -system.runtime.interopservices.runtimeinformation@4.0.0 -system.runtime.interopservices.runtimeinformation@4.3.0 -system.runtime.interopservices@4.1.0 -system.runtime.interopservices@4.3.0 -system.runtime.loader@4.0.0 -system.runtime.numerics@4.0.1 -system.runtime.serialization.json@4.0.2 -system.runtime.serialization.primitives@4.1.1 -system.runtime@4.1.0 -system.runtime@4.3.0 -system.security.accesscontrol@6.0.0 -system.security.claims@4.3.0 -system.security.cryptography.algorithms@4.2.0 -system.security.cryptography.cng@4.2.0 -system.security.cryptography.csp@4.0.0 -system.security.cryptography.encoding@4.0.0 -system.security.cryptography.openssl@4.0.0 -system.security.cryptography.primitives@4.0.0 -system.security.cryptography.protecteddata@6.0.0 -system.security.cryptography.x509certificates@4.1.0 -system.security.permissions@6.0.0 -system.security.principal.windows@4.3.0 -system.security.principal@4.3.0 -system.text.encoding.extensions@4.0.11 -system.text.encoding.extensions@4.3.0 -system.text.encoding@4.0.11 -system.text.encoding@4.3.0 -system.text.regularexpressions@4.1.0 -system.text.regularexpressions@4.3.0 -system.threading.tasks.extensions@4.0.0 -system.threading.tasks.extensions@4.3.0 -system.threading.tasks@4.0.11 -system.threading.tasks@4.3.0 -system.threading.thread@4.0.0 -system.threading.thread@4.3.0 -system.threading.threadpool@4.0.10 -system.threading.threadpool@4.3.0 -system.threading.timer@4.0.1 -system.threading@4.0.11 -system.threading@4.3.0 -system.windows.extensions@6.0.0 -system.xml.readerwriter@4.0.11 -system.xml.readerwriter@4.3.0 -system.xml.xdocument@4.0.11 -system.xml.xmldocument@4.0.1 -system.xml.xmldocument@4.3.0 -system.xml.xmlserializer@4.0.11 -system.xml.xpath.xmldocument@4.0.1 -system.xml.xpath.xmldocument@4.3.0 -system.xml.xpath@4.0.1 -system.xml.xpath@4.3.0 -" - -inherit check-reqs dotnet-pkg edo multiprocessing - -DESCRIPTION="SMT-based program verifier" -HOMEPAGE="https://github.com/boogie-org/boogie/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/boogie-org/${PN}.git" -else - SRC_URI="https://github.com/boogie-org/${PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - - KEYWORDS="~amd64" -fi - -SRC_URI+=" ${NUGET_URIS} " - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - sci-mathematics/z3 -" -BDEPEND=" - ${RDEPEND} - test? ( - dev-python/lit - dev-python/OutputCheck - ) -" - -PATCHES=( "${FILESDIR}/${PN}-3.0.4-disable-analyzers.patch" ) - -CHECKREQS_DISK_BUILD="2G" -DOTNET_PKG_PROJECTS=( Source/BoogieDriver/BoogieDriver.csproj ) -DOTNET_PKG_BUILD_EXTRA_ARGS=( -p:RollForward=Major ) - -pkg_setup() { - check-reqs_pkg_setup - dotnet-pkg_pkg_setup -} - -src_unpack() { - dotnet-pkg_src_unpack - - if [[ -n "${EGIT_REPO_URI}" ]] ; then - git-r3_src_unpack - fi -} - -src_prepare() { - # Remove bad tests. - local -a bad_tests=( - civl/inductive-sequentialization/BroadcastConsensus.bpl - civl/inductive-sequentialization/PingPong.bpl - civl/inductive-sequentialization/paxos/is.sh - prover/cvc5-offline.bpl - prover/cvc5.bpl - prover/exitcode.bpl - prover/z3-hard-timeout.bpl - prover/z3mutl.bpl - test15/CaptureInlineUnroll.bpl - test2/Timeouts0.bpl - test21/InterestingExamples4.bpl - ) - local bad_test - for bad_test in "${bad_tests[@]}" ; do - rm "${S}/Test/${bad_test}" || die - done - - # Update the boogieBinary variable. - sed "/^boogieBinary/s|= .*|= '${DOTNET_PKG_OUTPUT}/BoogieDriver.dll'|" \ - -i "${S}/Test/lit.site.cfg" || die "failed to update lit.site.cfg" - - dotnet-pkg_src_prepare -} - -src_test() { - einfo "Starting tests using the lit test tool." - local -a lit_opts=( - --order=lexical - --time-tests - --verbose - --workers="$(makeopts_jobs)" - ) - edob lit "${lit_opts[@]}" "${S}/Test" -} - -src_install() { - dotnet-pkg-base_install - dotnet-pkg-base_dolauncher "/usr/share/${P}/BoogieDriver" boogie - - einstalldocs -} diff --git a/dev-lang/boogie/boogie-3.1.1.ebuild b/dev-lang/boogie/boogie-3.1.1.ebuild deleted file mode 100644 index 412d21a3c9d6..000000000000 --- a/dev-lang/boogie/boogie-3.1.1.ebuild +++ /dev/null @@ -1,295 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DOTNET_PKG_COMPAT=8.0 -NUGETS=" -microsoft.bcl.asyncinterfaces@6.0.0 -microsoft.codecoverage@16.2.0 -microsoft.csharp@4.0.1 -microsoft.dotnet.internalabstractions@1.0.0 -microsoft.net.test.sdk@16.2.0 -microsoft.netcore.platforms@1.0.1 -microsoft.netcore.platforms@1.1.0 -microsoft.netcore.targets@1.0.1 -microsoft.netcore.targets@1.1.0 -microsoft.testplatform.objectmodel@16.2.0 -microsoft.testplatform.testhost@16.2.0 -microsoft.win32.primitives@4.0.1 -microsoft.win32.primitives@4.3.0 -microsoft.win32.registry@4.0.0 -microsoft.win32.registry@4.3.0 -microsoft.win32.systemevents@6.0.0 -netstandard.library@1.6.0 -netstandard.library@2.0.0 -newtonsoft.json@9.0.1 -nunit@3.12.0 -nunit3testadapter@3.15.1 -runtime.any.system.collections@4.3.0 -runtime.any.system.diagnostics.tools@4.3.0 -runtime.any.system.diagnostics.tracing@4.3.0 -runtime.any.system.globalization.calendars@4.3.0 -runtime.any.system.globalization@4.3.0 -runtime.any.system.io@4.3.0 -runtime.any.system.reflection.extensions@4.3.0 -runtime.any.system.reflection.primitives@4.3.0 -runtime.any.system.reflection@4.3.0 -runtime.any.system.resources.resourcemanager@4.3.0 -runtime.any.system.runtime.handles@4.3.0 -runtime.any.system.runtime.interopservices@4.3.0 -runtime.any.system.runtime@4.3.0 -runtime.any.system.text.encoding.extensions@4.3.0 -runtime.any.system.text.encoding@4.3.0 -runtime.any.system.threading.tasks@4.3.0 -runtime.any.system.threading.timer@4.3.0 -runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.native.system.io.compression@4.1.0 -runtime.native.system.net.http@4.0.1 -runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.native.system.security.cryptography@4.0.0 -runtime.native.system@4.0.0 -runtime.native.system@4.3.0 -runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0 -runtime.unix.microsoft.win32.primitives@4.3.0 -runtime.unix.system.console@4.3.0 -runtime.unix.system.diagnostics.debug@4.3.0 -runtime.unix.system.io.filesystem@4.3.0 -runtime.unix.system.net.primitives@4.3.0 -runtime.unix.system.net.sockets@4.3.0 -runtime.unix.system.private.uri@4.3.0 -runtime.unix.system.runtime.extensions@4.3.0 -system.appcontext@4.1.0 -system.buffers@4.0.0 -system.buffers@4.3.0 -system.collections.concurrent@4.0.12 -system.collections.immutable@1.2.0 -system.collections.nongeneric@4.0.1 -system.collections.nongeneric@4.3.0 -system.collections.specialized@4.0.1 -system.collections.specialized@4.3.0 -system.collections@4.0.11 -system.collections@4.3.0 -system.componentmodel.eventbasedasync@4.0.11 -system.componentmodel.eventbasedasync@4.3.0 -system.componentmodel.primitives@4.1.0 -system.componentmodel.primitives@4.3.0 -system.componentmodel.typeconverter@4.1.0 -system.componentmodel.typeconverter@4.3.0 -system.componentmodel@4.0.1 -system.componentmodel@4.3.0 -system.configuration.configurationmanager@6.0.0 -system.console@4.0.0 -system.diagnostics.debug@4.0.11 -system.diagnostics.debug@4.3.0 -system.diagnostics.diagnosticsource@4.0.0 -system.diagnostics.process@4.1.0 -system.diagnostics.process@4.3.0 -system.diagnostics.textwritertracelistener@4.0.0 -system.diagnostics.tools@4.0.1 -system.diagnostics.tracesource@4.0.0 -system.diagnostics.tracing@4.1.0 -system.diagnostics.tracing@4.3.0 -system.drawing.common@6.0.0 -system.dynamic.runtime@4.0.11 -system.globalization.calendars@4.0.1 -system.globalization.extensions@4.0.1 -system.globalization.extensions@4.3.0 -system.globalization@4.0.11 -system.globalization@4.3.0 -system.io.compression.zipfile@4.0.1 -system.io.compression@4.1.0 -system.io.filesystem.primitives@4.0.1 -system.io.filesystem.primitives@4.3.0 -system.io.filesystem@4.0.1 -system.io.filesystem@4.3.0 -system.io@4.1.0 -system.io@4.3.0 -system.linq.async@6.0.1 -system.linq.expressions@4.1.0 -system.linq@4.1.0 -system.linq@4.3.0 -system.net.http@4.1.0 -system.net.nameresolution@4.3.0 -system.net.primitives@4.0.11 -system.net.sockets@4.1.0 -system.objectmodel@4.0.12 -system.private.datacontractserialization@4.1.1 -system.private.uri@4.3.0 -system.reactive@4.4.1 -system.reflection.emit.ilgeneration@4.0.1 -system.reflection.emit.lightweight@4.0.1 -system.reflection.emit@4.0.1 -system.reflection.extensions@4.0.1 -system.reflection.extensions@4.3.0 -system.reflection.metadata@1.3.0 -system.reflection.primitives@4.0.1 -system.reflection.primitives@4.3.0 -system.reflection.typeextensions@4.1.0 -system.reflection.typeextensions@4.3.0 -system.reflection@4.1.0 -system.reflection@4.3.0 -system.resources.resourcemanager@4.0.1 -system.resources.resourcemanager@4.3.0 -system.runtime.caching@6.0.0 -system.runtime.extensions@4.1.0 -system.runtime.extensions@4.3.0 -system.runtime.handles@4.0.1 -system.runtime.handles@4.3.0 -system.runtime.interopservices.runtimeinformation@4.0.0 -system.runtime.interopservices.runtimeinformation@4.3.0 -system.runtime.interopservices@4.1.0 -system.runtime.interopservices@4.3.0 -system.runtime.loader@4.0.0 -system.runtime.numerics@4.0.1 -system.runtime.serialization.json@4.0.2 -system.runtime.serialization.primitives@4.1.1 -system.runtime@4.1.0 -system.runtime@4.3.0 -system.security.accesscontrol@6.0.0 -system.security.claims@4.3.0 -system.security.cryptography.algorithms@4.2.0 -system.security.cryptography.cng@4.2.0 -system.security.cryptography.csp@4.0.0 -system.security.cryptography.encoding@4.0.0 -system.security.cryptography.openssl@4.0.0 -system.security.cryptography.primitives@4.0.0 -system.security.cryptography.protecteddata@6.0.0 -system.security.cryptography.x509certificates@4.1.0 -system.security.permissions@6.0.0 -system.security.principal.windows@4.3.0 -system.security.principal@4.3.0 -system.text.encoding.extensions@4.0.11 -system.text.encoding.extensions@4.3.0 -system.text.encoding@4.0.11 -system.text.encoding@4.3.0 -system.text.regularexpressions@4.1.0 -system.text.regularexpressions@4.3.0 -system.threading.tasks.extensions@4.0.0 -system.threading.tasks.extensions@4.3.0 -system.threading.tasks@4.0.11 -system.threading.tasks@4.3.0 -system.threading.thread@4.0.0 -system.threading.thread@4.3.0 -system.threading.threadpool@4.0.10 -system.threading.threadpool@4.3.0 -system.threading.timer@4.0.1 -system.threading@4.0.11 -system.threading@4.3.0 -system.windows.extensions@6.0.0 -system.xml.readerwriter@4.0.11 -system.xml.readerwriter@4.3.0 -system.xml.xdocument@4.0.11 -system.xml.xmldocument@4.0.1 -system.xml.xmldocument@4.3.0 -system.xml.xmlserializer@4.0.11 -system.xml.xpath.xmldocument@4.0.1 -system.xml.xpath.xmldocument@4.3.0 -system.xml.xpath@4.0.1 -system.xml.xpath@4.3.0 -" - -inherit check-reqs dotnet-pkg edo multiprocessing - -DESCRIPTION="SMT-based program verifier" -HOMEPAGE="https://github.com/boogie-org/boogie/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/boogie-org/${PN}.git" -else - SRC_URI="https://github.com/boogie-org/${PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - - KEYWORDS="~amd64" -fi - -SRC_URI+=" ${NUGET_URIS} " - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - sci-mathematics/z3 -" -BDEPEND=" - ${RDEPEND} - test? ( - dev-python/lit - dev-python/OutputCheck - ) -" - -PATCHES=( "${FILESDIR}/${PN}-3.0.4-disable-analyzers.patch" ) - -CHECKREQS_DISK_BUILD="2G" -DOTNET_PKG_PROJECTS=( Source/BoogieDriver/BoogieDriver.csproj ) -DOTNET_PKG_BUILD_EXTRA_ARGS=( -p:RollForward=Major ) - -pkg_setup() { - check-reqs_pkg_setup - dotnet-pkg_pkg_setup -} - -src_unpack() { - dotnet-pkg_src_unpack - - if [[ -n "${EGIT_REPO_URI}" ]] ; then - git-r3_src_unpack - fi -} - -src_prepare() { - # Remove bad tests. - local -a bad_tests=( - civl/inductive-sequentialization/BroadcastConsensus.bpl - civl/inductive-sequentialization/PingPong.bpl - prover/cvc5-offline.bpl - prover/cvc5.bpl - prover/exitcode.bpl - prover/z3-hard-timeout.bpl - prover/z3mutl.bpl - test15/CaptureInlineUnroll.bpl - test2/Timeouts0.bpl - test21/InterestingExamples4.bpl - ) - local bad_test - for bad_test in "${bad_tests[@]}" ; do - rm "${S}/Test/${bad_test}" || die - done - - # Update the boogieBinary variable. - sed "/^boogieBinary/s|= .*|= '${DOTNET_PKG_OUTPUT}/BoogieDriver.dll'|" \ - -i "${S}/Test/lit.site.cfg" || die "failed to update lit.site.cfg" - - dotnet-pkg_src_prepare -} - -src_test() { - einfo "Starting tests using the lit test tool." - local -a lit_opts=( - --order=lexical - --time-tests - --verbose - --workers="$(makeopts_jobs)" - ) - edob lit "${lit_opts[@]}" "${S}/Test" -} - -src_install() { - dotnet-pkg-base_install - dotnet-pkg-base_dolauncher "/usr/share/${P}/BoogieDriver" boogie - - einstalldocs -} diff --git a/dev-lang/boogie/boogie-3.1.2.ebuild b/dev-lang/boogie/boogie-3.1.2.ebuild index 1e5de6f37894..7a1a6ee296b5 100644 --- a/dev-lang/boogie/boogie-3.1.2.ebuild +++ b/dev-lang/boogie/boogie-3.1.2.ebuild @@ -210,7 +210,7 @@ else SRC_URI="https://github.com/boogie-org/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="amd64" fi SRC_URI+=" ${NUGET_URIS} " diff --git a/dev-lang/boogie/boogie-3.1.4.ebuild b/dev-lang/boogie/boogie-3.1.4.ebuild new file mode 100644 index 000000000000..d7ab20c085a9 --- /dev/null +++ b/dev-lang/boogie/boogie-3.1.4.ebuild @@ -0,0 +1,303 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOTNET_PKG_COMPAT=8.0 +NUGETS=" +microsoft.bcl.asyncinterfaces@6.0.0 +microsoft.codecoverage@16.2.0 +microsoft.csharp@4.0.1 +microsoft.dotnet.internalabstractions@1.0.0 +microsoft.net.test.sdk@16.2.0 +microsoft.netcore.platforms@1.0.1 +microsoft.netcore.platforms@1.1.0 +microsoft.netcore.targets@1.0.1 +microsoft.netcore.targets@1.1.0 +microsoft.testplatform.objectmodel@16.2.0 +microsoft.testplatform.testhost@16.2.0 +microsoft.win32.primitives@4.0.1 +microsoft.win32.primitives@4.3.0 +microsoft.win32.registry@4.0.0 +microsoft.win32.registry@4.3.0 +microsoft.win32.systemevents@6.0.0 +netstandard.library@1.6.0 +netstandard.library@2.0.0 +newtonsoft.json@9.0.1 +nunit@3.12.0 +nunit3testadapter@3.15.1 +runtime.any.system.collections@4.3.0 +runtime.any.system.diagnostics.tools@4.3.0 +runtime.any.system.diagnostics.tracing@4.3.0 +runtime.any.system.globalization.calendars@4.3.0 +runtime.any.system.globalization@4.3.0 +runtime.any.system.io@4.3.0 +runtime.any.system.reflection.extensions@4.3.0 +runtime.any.system.reflection.primitives@4.3.0 +runtime.any.system.reflection@4.3.0 +runtime.any.system.resources.resourcemanager@4.3.0 +runtime.any.system.runtime.handles@4.3.0 +runtime.any.system.runtime.interopservices@4.3.0 +runtime.any.system.runtime@4.3.0 +runtime.any.system.text.encoding.extensions@4.3.0 +runtime.any.system.text.encoding@4.3.0 +runtime.any.system.threading.tasks@4.3.0 +runtime.any.system.threading.timer@4.3.0 +runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.0 +runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.0 +runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.0 +runtime.native.system.io.compression@4.1.0 +runtime.native.system.net.http@4.0.1 +runtime.native.system.security.cryptography.openssl@4.3.0 +runtime.native.system.security.cryptography@4.0.0 +runtime.native.system@4.0.0 +runtime.native.system@4.3.0 +runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.0 +runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.0 +runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0 +runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.0 +runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0 +runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0 +runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0 +runtime.unix.microsoft.win32.primitives@4.3.0 +runtime.unix.system.console@4.3.0 +runtime.unix.system.diagnostics.debug@4.3.0 +runtime.unix.system.io.filesystem@4.3.0 +runtime.unix.system.net.primitives@4.3.0 +runtime.unix.system.net.sockets@4.3.0 +runtime.unix.system.private.uri@4.3.0 +runtime.unix.system.runtime.extensions@4.3.0 +system.appcontext@4.1.0 +system.buffers@4.0.0 +system.buffers@4.3.0 +system.collections.concurrent@4.0.12 +system.collections.immutable@1.2.0 +system.collections.nongeneric@4.0.1 +system.collections.nongeneric@4.3.0 +system.collections.specialized@4.0.1 +system.collections.specialized@4.3.0 +system.collections@4.0.11 +system.collections@4.3.0 +system.componentmodel.eventbasedasync@4.0.11 +system.componentmodel.eventbasedasync@4.3.0 +system.componentmodel.primitives@4.1.0 +system.componentmodel.primitives@4.3.0 +system.componentmodel.typeconverter@4.1.0 +system.componentmodel.typeconverter@4.3.0 +system.componentmodel@4.0.1 +system.componentmodel@4.3.0 +system.configuration.configurationmanager@6.0.0 +system.console@4.0.0 +system.diagnostics.debug@4.0.11 +system.diagnostics.debug@4.3.0 +system.diagnostics.diagnosticsource@4.0.0 +system.diagnostics.process@4.1.0 +system.diagnostics.process@4.3.0 +system.diagnostics.textwritertracelistener@4.0.0 +system.diagnostics.tools@4.0.1 +system.diagnostics.tracesource@4.0.0 +system.diagnostics.tracing@4.1.0 +system.diagnostics.tracing@4.3.0 +system.drawing.common@6.0.0 +system.dynamic.runtime@4.0.11 +system.globalization.calendars@4.0.1 +system.globalization.extensions@4.0.1 +system.globalization.extensions@4.3.0 +system.globalization@4.0.11 +system.globalization@4.3.0 +system.io.compression.zipfile@4.0.1 +system.io.compression@4.1.0 +system.io.filesystem.primitives@4.0.1 +system.io.filesystem.primitives@4.3.0 +system.io.filesystem@4.0.1 +system.io.filesystem@4.3.0 +system.io@4.1.0 +system.io@4.3.0 +system.linq.async@6.0.1 +system.linq.expressions@4.1.0 +system.linq@4.1.0 +system.linq@4.3.0 +system.net.http@4.1.0 +system.net.nameresolution@4.3.0 +system.net.primitives@4.0.11 +system.net.sockets@4.1.0 +system.objectmodel@4.0.12 +system.private.datacontractserialization@4.1.1 +system.private.uri@4.3.0 +system.reactive@4.4.1 +system.reflection.emit.ilgeneration@4.0.1 +system.reflection.emit.lightweight@4.0.1 +system.reflection.emit@4.0.1 +system.reflection.extensions@4.0.1 +system.reflection.extensions@4.3.0 +system.reflection.metadata@1.3.0 +system.reflection.primitives@4.0.1 +system.reflection.primitives@4.3.0 +system.reflection.typeextensions@4.1.0 +system.reflection.typeextensions@4.3.0 +system.reflection@4.1.0 +system.reflection@4.3.0 +system.resources.resourcemanager@4.0.1 +system.resources.resourcemanager@4.3.0 +system.runtime.caching@6.0.0 +system.runtime.extensions@4.1.0 +system.runtime.extensions@4.3.0 +system.runtime.handles@4.0.1 +system.runtime.handles@4.3.0 +system.runtime.interopservices.runtimeinformation@4.0.0 +system.runtime.interopservices.runtimeinformation@4.3.0 +system.runtime.interopservices@4.1.0 +system.runtime.interopservices@4.3.0 +system.runtime.loader@4.0.0 +system.runtime.numerics@4.0.1 +system.runtime.serialization.json@4.0.2 +system.runtime.serialization.primitives@4.1.1 +system.runtime@4.1.0 +system.runtime@4.3.0 +system.security.accesscontrol@6.0.0 +system.security.claims@4.3.0 +system.security.cryptography.algorithms@4.2.0 +system.security.cryptography.cng@4.2.0 +system.security.cryptography.csp@4.0.0 +system.security.cryptography.encoding@4.0.0 +system.security.cryptography.openssl@4.0.0 +system.security.cryptography.primitives@4.0.0 +system.security.cryptography.protecteddata@6.0.0 +system.security.cryptography.x509certificates@4.1.0 +system.security.permissions@6.0.0 +system.security.principal.windows@4.3.0 +system.security.principal@4.3.0 +system.text.encoding.extensions@4.0.11 +system.text.encoding.extensions@4.3.0 +system.text.encoding@4.0.11 +system.text.encoding@4.3.0 +system.text.regularexpressions@4.1.0 +system.text.regularexpressions@4.3.0 +system.threading.tasks.extensions@4.0.0 +system.threading.tasks.extensions@4.3.0 +system.threading.tasks@4.0.11 +system.threading.tasks@4.3.0 +system.threading.thread@4.0.0 +system.threading.thread@4.3.0 +system.threading.threadpool@4.0.10 +system.threading.threadpool@4.3.0 +system.threading.timer@4.0.1 +system.threading@4.0.11 +system.threading@4.3.0 +system.windows.extensions@6.0.0 +system.xml.readerwriter@4.0.11 +system.xml.readerwriter@4.3.0 +system.xml.xdocument@4.0.11 +system.xml.xmldocument@4.0.1 +system.xml.xmldocument@4.3.0 +system.xml.xmlserializer@4.0.11 +system.xml.xpath.xmldocument@4.0.1 +system.xml.xpath.xmldocument@4.3.0 +system.xml.xpath@4.0.1 +system.xml.xpath@4.3.0 +" + +inherit check-reqs dotnet-pkg edo multiprocessing + +DESCRIPTION="SMT-based program verifier" +HOMEPAGE="https://github.com/boogie-org/boogie/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/boogie-org/${PN}.git" +else + SRC_URI="https://github.com/boogie-org/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + + KEYWORDS="~amd64" +fi + +SRC_URI+=" ${NUGET_URIS} " + +LICENSE="MIT" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + sci-mathematics/z3 +" +BDEPEND=" + ${RDEPEND} + test? ( + dev-python/OutputCheck + dev-python/lit + dev-python/psutil + ) +" + +PATCHES=( "${FILESDIR}/${PN}-3.0.4-disable-analyzers.patch" ) + +CHECKREQS_DISK_BUILD="2G" +DOTNET_PKG_PROJECTS=( Source/BoogieDriver/BoogieDriver.csproj ) +DOTNET_PKG_BUILD_EXTRA_ARGS=( -p:RollForward=Major ) + +pkg_setup() { + check-reqs_pkg_setup + dotnet-pkg_pkg_setup +} + +src_unpack() { + dotnet-pkg_src_unpack + + if [[ -n "${EGIT_REPO_URI}" ]] ; then + git-r3_src_unpack + fi +} + +src_prepare() { + # Remove bad tests. + local -a bad_tests=( + civl/inductive-sequentialization/BroadcastConsensus.bpl + civl/inductive-sequentialization/ChangRoberts.bpl + civl/inductive-sequentialization/PingPong.bpl + civl/large-samples/GC.bpl + civl/paxos/is.sh + civl/samples/reserve.bpl + inst/vector-generic.bpl + livevars/stack_overflow.bpl + prover/cvc5-offline.bpl + prover/cvc5.bpl + prover/exitcode.bpl + prover/z3-hard-timeout.bpl + prover/z3mutl.bpl + test15/CaptureInlineUnroll.bpl + test2/Timeouts0.bpl + test21/InterestingExamples4.bpl + ) + local bad_test + for bad_test in "${bad_tests[@]}" ; do + rm "${S}/Test/${bad_test}" || die + done + + # Update the boogieBinary variable. + sed "/^boogieBinary/s|= .*|= '${DOTNET_PKG_OUTPUT}/BoogieDriver.dll'|" \ + -i "${S}/Test/lit.site.cfg" || die "failed to update lit.site.cfg" + + dotnet-pkg_src_prepare +} + +src_test() { + einfo "Starting tests using the lit test tool." + local -a lit_opts=( + --order=lexical + --time-tests + --timeout 1800 # Let one test take no mere than half a hour. + --verbose + --workers="$(makeopts_jobs)" + ) + edob lit "${lit_opts[@]}" "${S}/Test" +} + +src_install() { + dotnet-pkg-base_install + dotnet-pkg-base_dolauncher "/usr/share/${P}/BoogieDriver" boogie + + einstalldocs +} diff --git a/dev-lang/closure-compiler-bin/Manifest b/dev-lang/closure-compiler-bin/Manifest index d4da0c407dfd..5b600cd386e8 100644 --- a/dev-lang/closure-compiler-bin/Manifest +++ b/dev-lang/closure-compiler-bin/Manifest @@ -1,2 +1 @@ -DIST closure-compiler-v20231112.jar 14084315 BLAKE2B e56777723c2c306d8c7ddb700778bc2cea9c96967f17d78e4e3dc31e9dcf1debe73ec6ff1b54b1b89f7407add12c3c16ebe4111b397bfca85d695278744db69f SHA512 e07ff9f57cf7672a79bc72fc8d5f447134df3009b72e50b7bbba644ebb6cbc080b3870f0dd7a47aa85a0b7d1b2e26bbeb0b4d057864e3d29fb5249c1ec8e3e13 DIST closure-compiler-v20240317.jar 13984957 BLAKE2B cc9fd9e7dca6a95e62fe6d922dfad90d654ddddf15cd001c75a60ea5a893cea20e59d70b9a053d6b69853fc16c249c5994b2cff093838ff3fa79af0d5964313b SHA512 7bf276195fc6857e491cc16b12b33e1da55988c634ec5fea34d5b67e11e6caed91afff1d81bd91d77863200301f098549526d543be9c54eee4550bc20791a295 diff --git a/dev-lang/closure-compiler-bin/closure-compiler-bin-20231112.ebuild b/dev-lang/closure-compiler-bin/closure-compiler-bin-20231112.ebuild deleted file mode 100644 index 1790b462aa70..000000000000 --- a/dev-lang/closure-compiler-bin/closure-compiler-bin-20231112.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-pkg-2 - -MY_PN="${PN%-bin}" -MY_P="${MY_PN}-v${PV}" - -DESCRIPTION="JavaScript optimizing compiler" -HOMEPAGE="https://developers.google.com/closure/compiler/ - https://github.com/google/closure-compiler/" -SRC_URI="https://repo1.maven.org/maven2/com/google/javascript/${MY_PN}/v${PV}/${MY_P}.jar" -S="${WORKDIR}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - >=virtual/jre-1.8:* -" - -src_unpack() { - : -} - -src_compile() { - : -} - -src_install() { - java-pkg_jarinto "/opt/${PN}-${SLOT}/lib" - java-pkg_newjar "${DISTDIR}/${MY_P}.jar" "${PN}.jar" - - local -a dolauncher_opts=( - "${MY_PN}" - --jar "/opt/${PN}-${SLOT}/lib/${PN}.jar" - -into /opt - ) - java-pkg_dolauncher "${dolauncher_opts[@]}" -} diff --git a/dev-lang/coffee-script/Manifest b/dev-lang/coffee-script/Manifest index a196a6a54634..17608fb122ab 100644 --- a/dev-lang/coffee-script/Manifest +++ b/dev-lang/coffee-script/Manifest @@ -1,2 +1 @@ -DIST coffee-script-2.5.1.tar.gz 2226483 BLAKE2B 5a2c5f93d46b111aeda63077f60992232a768008187ba0e41bec885184fbbbb91014620fca5d8e38cfdb5e88de483425d3d95c87779f27d7450de7cbe62b489b SHA512 99f11f0822ffc841552cf6c78a28d152554f070df6d1b729bdd17df8ba6faae6ed2ba9886f7ee13ccb316de698ab8624370287274611fe90bef033d9f76c5865 DIST coffee-script-2.7.0.tar.gz 2271083 BLAKE2B b79f8a3f3edd60b43e4f09c940a6461819199edf9d16dcb7f555a0230c45a9d7c86d2467a3c126e436c23245adaa4c26518dc820c222ce87118217db1ff2c252 SHA512 1a3ce93f67c3361ce8c8c182e4a8170b05019b08557c14285ed7ed7620e501717d97a991f0ebb884845811fdc2d5d76ba5fe4a92adebc3a8b3331b483eded5ab diff --git a/dev-lang/coffee-script/coffee-script-2.5.1.ebuild b/dev-lang/coffee-script/coffee-script-2.5.1.ebuild deleted file mode 100644 index e042a4d9f200..000000000000 --- a/dev-lang/coffee-script/coffee-script-2.5.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="coffeescript" - -DESCRIPTION="A little language that compiles into javascript" -HOMEPAGE="https://coffeescript.org/" -SRC_URI="https://github.com/jashkenas/${MY_PN}/archive/${PV}.tar.gz - -> ${P}.tar.gz" -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" - -# This package has a test suite (that works), but it requires a number -# of NodeJS/NPM packages that aren't in the tree. -IUSE="doc examples" - -RDEPEND="net-libs/nodejs" - -src_install() { - local npm_module_dir="/usr/$(get_libdir)/node/${PN}" - insinto "${npm_module_dir}" - doins *.js package.json - doins -r lib - dodoc CONTRIBUTING.md README.md - - if use examples; then - # Users should be able to run the examples without having to copy - # them to another directory and decompress them. - docompress -x "/usr/share/doc/${PF}/examples" - dodoc -r documentation/examples - fi - - if use doc; then - # It looks like "docs/v2" contains the output from all of the stuff - # under "documentation". - docinto "html" - dodoc -r docs/v2/* - fi - - # The coffee and cake "binaries" use a relative path to find the lib - # directory, so we have to symlink them rather than use dobin(). - exeinto "${npm_module_dir}/bin" - doexe bin/cake - doexe bin/coffee - dosym "${npm_module_dir}/bin/cake" "/usr/bin/cake" - dosym "${npm_module_dir}/bin/coffee" "/usr/bin/coffee" -} diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest index 79cd9171ed9c..890098d53fae 100644 --- a/dev-lang/crystal/Manifest +++ b/dev-lang/crystal/Manifest @@ -1,2 +1,4 @@ DIST crystal-1.11.2-1-linux-x86_64.tar.gz 46947860 BLAKE2B c3f08d8a399c139f2eb465857142ad6faaf6925459318d5e6b5b5b879974cc63f43c99f8b2d1fa852fe239a81c0341e24c84023b8b8113bc2bfe9e4fe03c8346 SHA512 54cf8e24d5bd87602a65d22dfa0bbe3520b49cedb430d0652066caf2f47d1cea1bafdb852133a886f3c3b324826212dfa82ac15475ef044016b4b8210e20da39 DIST crystal-1.11.2.tar.gz 3620048 BLAKE2B 3838f43897ba74a3c7f5717ba795f38cfd4265bbcbe11fa5a155d196afae40c60f7b5789c5d97e94eea1a1affb2cbd5c7fa9208e74a0fa7fa932b013e6124923 SHA512 e9b828539359fbae93799654f39b75c0c72764348ae279da326ac4ff4d2fa8e693c01956f5bc7ce1fff1504156049bf2b261c8defbde9cb690e1e84c13c8a296 +DIST crystal-1.12.1-1-linux-x86_64.tar.gz 47041074 BLAKE2B 7e5d4a422144902de4b187947d55f9e8069d55f51013e10236fcf79b142ff96fc39973c883f5a633fbd10180553b6c82bdea824bff09d355fa171e4f5e308b68 SHA512 3256dc2340ed7b783bdf7e5f3d5c03cf981655ac2f50921aa53ada13cc72315d5a70515adb1c511f0f6e37c09310a963773b4f57eaeffe34c68e539edaaa7726 +DIST crystal-1.12.1.tar.gz 3657963 BLAKE2B 42cf32dca63a2bdd2925b4970e2277cb163ddcdbcbc997b7c72b155024f642d03c5a565e82dfc8a2b1aed0d3f877633beb9d128eb592485c034bfdcbc3f5baab SHA512 bd0c085d44a473b86797fa64ce9a5c66c7d3eda44bdba929faee490b635aef45bdf84b45baaa5dfea8e2b6fd218d1ae7fbdf117d3924b04b284075d4a500e55c diff --git a/dev-lang/crystal/crystal-1.12.1.ebuild b/dev-lang/crystal/crystal-1.12.1.ebuild new file mode 100644 index 000000000000..02631f5f838f --- /dev/null +++ b/dev-lang/crystal/crystal-1.12.1.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +BV="${PV}-1" +BV_AMD64="${BV}-linux-x86_64" + +LLVM_MAX_SLOT=17 + +inherit bash-completion-r1 llvm multiprocessing toolchain-funcs + +DESCRIPTION="The Crystal Programming Language" +HOMEPAGE="https://crystal-lang.org/ + https://github.com/crystal-lang/crystal/" +SRC_URI=" + https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz + -> ${P}.tar.gz + amd64? ( + https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz + ) +" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc debug llvm-libunwind" + +# Upstream test suite not reliable +RESTRICT="test" + +DEPEND=" + +Date: Thu, 8 Feb 2024 08:08:03 +0100 +Subject: [PATCH] Skip tests if Erlang was compiled without docs, closes #13322 + +--- + lib/iex/test/iex/helpers_test.exs | 12 +++++++++--- + lib/iex/test/test_helper.exs | 10 +++++++++- + 2 files changed, 18 insertions(+), 4 deletions(-) + +diff --git a/lib/iex/test/iex/helpers_test.exs b/lib/iex/test/iex/helpers_test.exs +index 54f946516ce..171acc72abc 100644 +--- a/lib/iex/test/iex/helpers_test.exs ++++ b/lib/iex/test/iex/helpers_test.exs +@@ -332,17 +332,20 @@ defmodule IEx.HelpersTest do + assert help =~ "Welcome to Interactive Elixir" + end + ++ @tag :erlang_doc + test "prints Erlang module documentation" do + captured = capture_io(fn -> h(:timer) end) + assert captured =~ "This module provides useful functions related to time." + end + ++ @tag :erlang_doc + test "prints Erlang module function specs" do + captured = capture_io(fn -> h(:timer.sleep() / 1) end) + assert captured =~ ":timer.sleep/1" + assert captured =~ "-spec sleep(Time) -> ok when Time :: timeout()." + end + ++ @tag :erlang_doc + test "handles non-existing Erlang module function" do + captured = capture_io(fn -> h(:timer.baz() / 1) end) + assert captured =~ "No documentation for :timer.baz was found" +@@ -1008,13 +1011,15 @@ defmodule IEx.HelpersTest do + cleanup_modules([TypeSample]) + end + +- test "prints all types in erlang module" do ++ @tag :erlang_doc ++ test "prints all types in Erlang module" do + captured = capture_io(fn -> t(:queue) end) + assert captured =~ "-type queue() :: queue(_)" + assert captured =~ "-opaque queue(Item)" + end + +- test "prints single type from erlang module" do ++ @tag :erlang_doc ++ test "prints single type from Erlang module" do + captured = capture_io(fn -> t(:erlang.iovec()) end) + assert captured =~ "-type iovec() :: [binary()]" + assert captured =~ "A list of binaries." +@@ -1024,7 +1029,8 @@ defmodule IEx.HelpersTest do + assert captured =~ "A list of binaries." + end + +- test "handles non-existing types from erlang module" do ++ @tag :erlang_doc ++ test "handles non-existing types from Erlang module" do + captured = capture_io(fn -> t(:erlang.foo()) end) + assert captured =~ "No type information for :erlang.foo was found or :erlang.foo is private" + +diff --git a/lib/iex/test/test_helper.exs b/lib/iex/test/test_helper.exs +index f5a55f0aa80..b32c8be4e91 100644 +--- a/lib/iex/test/test_helper.exs ++++ b/lib/iex/test/test_helper.exs +@@ -7,11 +7,19 @@ IEx.configure(colors: [enabled: false]) + {line_exclude, line_include} = + if line = System.get_env("LINE"), do: {[:test], [line: line]}, else: {[], []} + ++erlang_doc_exclude = ++ if match?({:docs_v1, _, _, _, _, _, _}, Code.fetch_docs(:array)) do ++ [] ++ else ++ IO.puts("Erlang/OTP compiled without docs, some tests are excluded...") ++ [:erlang_doc] ++ end ++ + ExUnit.start( + assert_receive_timeout: assert_timeout, + trace: !!System.get_env("TRACE"), + include: line_include, +- exclude: line_exclude ++ exclude: line_exclude ++ erlang_doc_exclude + ) + + defmodule IEx.Case do diff --git a/dev-lang/fennel/fennel-1.4.0-r1.ebuild b/dev-lang/fennel/fennel-1.4.0-r1.ebuild deleted file mode 100644 index 367c7a62e82d..000000000000 --- a/dev-lang/fennel/fennel-1.4.0-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Fails to build with with "lua5-1". -LUA_COMPAT=( lua5-{3,4} ) - -inherit lua-single - -DESCRIPTION="Lisp-like language that compiles to Lua" -HOMEPAGE="https://fennel-lang.org/ - https://sr.ht/~technomancy/fennel/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://git.sr.ht/~technomancy/${PN}" -else - SRC_URI="https://git.sr.ht/~technomancy/${PN}/archive/${PV}.tar.gz - -> ${P}.tar.gz" - - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86" -fi - -LICENSE="MIT" -SLOT="0/${PV}" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RDEPEND=" - ${LUA_DEPS} -" -BDEPEND=" - ${RDEPEND} -" - -src_prepare() { - default - - # Turn off failing tests. bug https://bugs.gentoo.org/906351 - sed -e 's|"failures",||' -e 's|"repl",||' -i test/init.lua || die -} - -src_test() { - emake test -} - -src_install() { - emake LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" PREFIX="${ED}/usr" install - - dodoc *.md -} diff --git a/dev-lang/fennel/fennel-1.4.0-r2.ebuild b/dev-lang/fennel/fennel-1.4.0-r2.ebuild new file mode 100644 index 000000000000..68ee8a548f2b --- /dev/null +++ b/dev-lang/fennel/fennel-1.4.0-r2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Fails to build with with "lua5-1". +LUA_COMPAT=( lua5-{3,4} luajit ) + +inherit lua-single + +DESCRIPTION="Lisp-like language that compiles to Lua" +HOMEPAGE="https://fennel-lang.org/ + https://sr.ht/~technomancy/fennel/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://git.sr.ht/~technomancy/${PN}" +else + SRC_URI="https://git.sr.ht/~technomancy/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86" +fi + +LICENSE="MIT" +SLOT="0/${PV}" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + ${LUA_DEPS} +" +BDEPEND=" + ${RDEPEND} +" + +src_prepare() { + default + + # Turn off failing tests. bug https://bugs.gentoo.org/906351 + sed -e 's|"failures",||' -e 's|"repl",||' -i test/init.lua || die + + # Remove bad tests, bug #923281 + rm test/macro.fnl || die + sed -i test/init.lua -e 's|"test.macro",||' || die +} + +src_test() { + emake test +} + +src_install() { + emake LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" PREFIX="${ED}/usr" install + + dodoc *.md +} diff --git a/dev-lang/fennel/fennel-1.4.2-r1.ebuild b/dev-lang/fennel/fennel-1.4.2-r1.ebuild new file mode 100644 index 000000000000..71f067aa7941 --- /dev/null +++ b/dev-lang/fennel/fennel-1.4.2-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Fails to build with with "lua5-1". +LUA_COMPAT=( lua5-{3,4} luajit ) + +inherit lua-single + +DESCRIPTION="Lisp-like language that compiles to Lua" +HOMEPAGE="https://fennel-lang.org/ + https://sr.ht/~technomancy/fennel/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://git.sr.ht/~technomancy/${PN}" +else + SRC_URI="https://git.sr.ht/~technomancy/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +fi + +LICENSE="MIT" +SLOT="0/${PV}" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + ${LUA_DEPS} +" +BDEPEND=" + ${RDEPEND} +" + +src_prepare() { + default + + # Turn off failing tests. bug https://bugs.gentoo.org/906351 + sed -e 's|"failures",||' -e 's|"repl",||' -i test/init.lua || die + + # Remove bad tests, bug #923281 + rm test/macro.fnl || die + sed -i test/init.lua -e 's|"test.macro",||' || die +} + +src_test() { + emake test +} + +src_install() { + emake LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" PREFIX="${ED}/usr" install + + dodoc *.md +} diff --git a/dev-lang/fennel/fennel-1.4.2.ebuild b/dev-lang/fennel/fennel-1.4.2.ebuild deleted file mode 100644 index 2970b228386f..000000000000 --- a/dev-lang/fennel/fennel-1.4.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Fails to build with with "lua5-1". -LUA_COMPAT=( lua5-{3,4} ) - -inherit lua-single - -DESCRIPTION="Lisp-like language that compiles to Lua" -HOMEPAGE="https://fennel-lang.org/ - https://sr.ht/~technomancy/fennel/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://git.sr.ht/~technomancy/${PN}" -else - SRC_URI="https://git.sr.ht/~technomancy/${PN}/archive/${PV}.tar.gz - -> ${P}.tar.gz" - - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -fi - -LICENSE="MIT" -SLOT="0/${PV}" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RDEPEND=" - ${LUA_DEPS} -" -BDEPEND=" - ${RDEPEND} -" - -src_prepare() { - default - - # Turn off failing tests. bug https://bugs.gentoo.org/906351 - sed -e 's|"failures",||' -e 's|"repl",||' -i test/init.lua || die -} - -src_test() { - emake test -} - -src_install() { - emake LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" PREFIX="${ED}/usr" install - - dodoc *.md -} diff --git a/dev-lang/go/go-1.21.8.ebuild b/dev-lang/go/go-1.21.8.ebuild index 96d0db35e47d..7588d8461f60 100644 --- a/dev-lang/go/go-1.21.8.ebuild +++ b/dev-lang/go/go-1.21.8.ebuild @@ -23,7 +23,7 @@ case ${PV} in case ${PV} in *_beta*|*_rc*) ;; *) - KEYWORDS="-* amd64 ~arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac esac diff --git a/dev-lang/go/go-1.21.9.ebuild b/dev-lang/go/go-1.21.9.ebuild index 0c272fe43c05..96d0db35e47d 100644 --- a/dev-lang/go/go-1.21.9.ebuild +++ b/dev-lang/go/go-1.21.9.ebuild @@ -23,7 +23,7 @@ case ${PV} in case ${PV} in *_beta*|*_rc*) ;; *) - KEYWORDS="-* amd64 ~arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 ~arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac esac diff --git a/dev-lang/go/go-1.22.1.ebuild b/dev-lang/go/go-1.22.1.ebuild index 2b831bae8c02..38f5a0419240 100644 --- a/dev-lang/go/go-1.22.1.ebuild +++ b/dev-lang/go/go-1.22.1.ebuild @@ -23,7 +23,7 @@ case ${PV} in case ${PV} in *_beta*|*_rc*) ;; *) - KEYWORDS="-* amd64 ~arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac esac diff --git a/dev-lang/go/go-1.22.2.ebuild b/dev-lang/go/go-1.22.2.ebuild index a665e6fc2359..2b831bae8c02 100644 --- a/dev-lang/go/go-1.22.2.ebuild +++ b/dev-lang/go/go-1.22.2.ebuild @@ -23,7 +23,7 @@ case ${PV} in case ${PV} in *_beta*|*_rc*) ;; *) - KEYWORDS="-* amd64 ~arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 ~arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac esac diff --git a/dev-lang/gprolog/gprolog-1.5.0-r1.ebuild b/dev-lang/gprolog/gprolog-1.5.0-r1.ebuild new file mode 100644 index 000000000000..29233aa9547b --- /dev/null +++ b/dev-lang/gprolog/gprolog-1.5.0-r1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Native Prolog compiler with constraint solving over finite domains (FD)" +HOMEPAGE="http://www.gprolog.org/" +SRC_URI="http://www.gprolog.org/${P}.tar.gz" +S="${WORKDIR}"/${P} + +LICENSE="|| ( GPL-2+ LGPL-3+ )" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="debug doc examples" + +PATCHES=( + "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-links.patch + "${FILESDIR}"/${P}-destdir.patch + "${FILESDIR}"/${P}-llvm-as.patch +) + +src_prepare() { + default + + cd "${S}"/src || die + eautoconf +} + +src_configure() { + CFLAGS_MACHINE="$(get-flag -march) $(get-flag -mcpu) $(get-flag -mtune)" + + use debug && append-flags -DDEBUG + + if tc-enables-pie; then + # gplc generates its own native ASM; disable PIE + append-ldflags -no-pie + fi + + if tc-is-gcc && ! use x86; then + gprolog_use_regs=yes + else + gprolog_use_regs=no + fi + + if tc-is-clang; then + AS=$(tc-getCC) + else + AS=$(tc-getAS) + fi + + cd "${S}"/src || die + local myeconfargs=( + AS="${AS}" + CFLAGS_MACHINE="${CFLAGS_MACHINE}" + --with-c-flags="${CFLAGS}" + --with-install-dir="${EPREFIX}"/usr/$(get_libdir)/${P} + --with-links-dir="${EPREFIX}"/usr/bin + --enable-regs=${gprolog_use_regs} + $(use_with doc doc-dir "${EPREFIX}"/usr/share/doc/${PF}) + $(use_with doc html-dir "${EPREFIX}"/usr/share/doc/${PF}/html) + $(use_with examples examples-dir "${EPREFIX}"/usr/share/doc/${PF}/examples) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + cd "${S}"/src || die + + # gprolog is compiled using gplc which cannot be run in parallel + emake -j1 +} + +src_test() { + cd "${S}"/src || die + + emake -j1 check +} + +src_install() { + cd "${S}"/src || die + emake DESTDIR="${D}" TXT_FILES= install + + cd "${S}" || die + dodoc ChangeLog NEWS PROBLEMS README +} diff --git a/dev-lang/gprolog/gprolog-1.5.0.ebuild b/dev-lang/gprolog/gprolog-1.5.0.ebuild deleted file mode 100644 index e5959b8c30f4..000000000000 --- a/dev-lang/gprolog/gprolog-1.5.0.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="A native Prolog compiler with constraint solving over finite domains (FD)" -HOMEPAGE="http://www.gprolog.org/" -SRC_URI="http://www.gprolog.org/${P}.tar.gz" -S="${WORKDIR}"/${P} - -LICENSE="|| ( GPL-2+ LGPL-3+ )" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug doc examples" - -PATCHES=( - "${FILESDIR}"/${P}-ldflags.patch - "${FILESDIR}"/${P}-links.patch - "${FILESDIR}"/${P}-destdir.patch - "${FILESDIR}"/${P}-llvm-as.patch -) - -src_prepare() { - default - - cd "${S}"/src - eautoconf -} - -src_configure() { - CFLAGS_MACHINE="`get-flag -march` `get-flag -mcpu` `get-flag -mtune`" - - use debug && append-flags -DDEBUG - - if tc-enables-pie; then - # gplc generates its own native ASM; disable PIE - append-ldflags -no-pie - fi - - if tc-is-gcc && ! use x86; then - gprolog_use_regs=yes - else - gprolog_use_regs=no - fi - - if tc-is-clang; then - AS=$(tc-getCC) - else - AS=$(tc-getAS) - fi - - cd "${S}"/src || die - econf \ - AS="${AS}" \ - CFLAGS_MACHINE="${CFLAGS_MACHINE}" \ - --with-c-flags="${CFLAGS}" \ - --with-install-dir="${EPREFIX}"/usr/$(get_libdir)/${P} \ - --with-links-dir="${EPREFIX}"/usr/bin \ - --enable-regs=${gprolog_use_regs} \ - $(use_with doc doc-dir "${EPREFIX}"/usr/share/doc/${PF}) \ - $(use_with doc html-dir "${EPREFIX}"/usr/share/doc/${PF}/html) \ - $(use_with examples examples-dir "${EPREFIX}"/usr/share/doc/${PF}/examples) -} - -src_compile() { - cd "${S}"/src || die - - # gprolog is compiled using gplc which cannot be run in parallel - emake -j1 -} - -src_test() { - cd "${S}"/src || die - - emake -j1 check -} - -src_install() { - cd "${S}"/src || die - emake DESTDIR="${D}" TXT_FILES= install - - cd "${S}" || die - dodoc ChangeLog NEWS PROBLEMS README -} diff --git a/dev-lang/kotlin-bin/Manifest b/dev-lang/kotlin-bin/Manifest index 54cdb6f63f56..26b3955650c9 100644 --- a/dev-lang/kotlin-bin/Manifest +++ b/dev-lang/kotlin-bin/Manifest @@ -1,2 +1 @@ -DIST kotlin-compiler-1.9.22.zip 91026092 BLAKE2B 2fc776b27e30a9d75640dc8fc004bfec5207b1b79c2742aa6a8a75971a8b41310cc16712d6d0921e1fa7545031a75ca8256c48f5c1e13f4e36d82df2574d5699 SHA512 d0e1bdfb1918f007444b1cef6e0c29c2c1846819edd60d016ed62327ea6d2cb505aa18658f916f88b91d9fbdfe0b155ad3361728d6a7a9062806d982bc9b8c6c DIST kotlin-compiler-1.9.23.zip 91045770 BLAKE2B f15bf111b0de8527312ae3ffced8fd80812a8ea949f4157d21085966ec7f9c19facf116cc70915d41aca2fb4b3c3d1d9d3cebe23c5312728f295204528c82f2d SHA512 6baea5f968b8cd21a89fd80302a26761b775d2631d5a434775eecf1c4bbc1e07b657f389da4c4d2cd10e3687908e0417d12b94ed822b029a7126ae1988dba445 diff --git a/dev-lang/kotlin-bin/kotlin-bin-1.9.22.ebuild b/dev-lang/kotlin-bin/kotlin-bin-1.9.22.ebuild deleted file mode 100644 index 7e3629cfadfc..000000000000 --- a/dev-lang/kotlin-bin/kotlin-bin-1.9.22.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-pkg-2 wrapper - -DESCRIPTION="Statically typed language that targets the JVM and JavaScript" -HOMEPAGE="https://kotlinlang.org/ - https://github.com/JetBrains/kotlin/" -SRC_URI="https://github.com/JetBrains/kotlin/releases/download/v${PV}/kotlin-compiler-${PV}.zip" -S="${WORKDIR}/kotlinc" - -LICENSE="Apache-2.0 BSD MIT NPL-1.1" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - >=virtual/jre-1.8:* -" -DEPEND=" - >=virtual/jdk-1.8:* -" -BDEPEND=" - app-arch/unzip -" - -src_prepare() { - default - - rm bin/*.bat || die -} - -src_compile() { - : -} - -src_install() { - java-pkg_dojar lib/* - - # Follow the Java eclass JAR installation path. - local app_home="/usr/share/${PN}" - - exeinto "${app_home}/bin" - doexe bin/* - - local -a exes=( - kapt - kotlin - kotlinc - kotlinc-js - kotlinc-jvm - kotlin-dce-js - ) - local exe - for exe in "${exes[@]}" ; do - make_wrapper "${exe}" "${app_home}/bin/${exe}" - done -} diff --git a/dev-lang/logtalk/logtalk-3.47.0-r1.ebuild b/dev-lang/logtalk/logtalk-3.47.0-r1.ebuild new file mode 100644 index 000000000000..e65ccc6e0960 --- /dev/null +++ b/dev-lang/logtalk/logtalk-3.47.0-r1.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg + +DESCRIPTION="Open source object-oriented logic programming language" +HOMEPAGE="https://logtalk.org" +SRC_URI="https://logtalk.org/files/${P}.tar.bz2" +LICENSE="Apache-2.0" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="fop xslt" + +RDEPEND=" + xslt? ( dev-libs/libxslt ) + fop? ( dev-java/fop )" + +PATCHES=( + "${FILESDIR}"/${P}-portage.patch +) + +src_install() { + # Look at scripts/install.sh for upstream installation process. + # Install logtalk base + mv scripts/logtalk_user_setup.sh integration/ || die + mkdir -p "${ED}/usr/share/${P}" || die + cp -r adapters coding contributions core docs examples integration \ + library manuals paths scratch tests tools VERSION.txt \ + loader-sample.lgt settings-sample.lgt tester-sample.lgt \ + tests-sample.lgt \ + "${ED}/usr/share/${P}" \ + || die "Failed to install files" + + # Install mime file, the database will be updated later + insinto /usr/share/mime/packages + doins scripts/freedesktop/logtalk.xml + + # Install documentation + dodoc ACKNOWLEDGMENTS.md BIBLIOGRAPHY.bib CONTRIBUTING.md \ + CUSTOMIZE.md INSTALL.md LICENSE.txt QUICK_START.md \ + README.md RELEASE_NOTES.md UPGRADING.md VERSION.txt + + rm -f man/man1/logtalk_backend_select.1 || die + rm -f man/man1/logtalk_version_select.1 || die + doman man/man1/*.1 + + # Integration symlinks + dosym ../share/${P}/integration/logtalk_user_setup.sh \ + /usr/bin/logtalk_user_setup + dosym ../share/${P}/integration/bplgt.sh \ + /usr/bin/bplgt + dosym ../share/${P}/integration/ciaolgt.sh \ + /usr/bin/ciaolgt + dosym ../share/${P}/integration/cxlgt.sh \ + /usr/bin/cxlgt + dosym ../share/${P}/integration/eclipselgt.sh \ + /usr/bin/eclipselgt + dosym ../share/${P}/integration/gplgt.sh \ + /usr/bin/gplgt + dosym ../share/${P}/integration/jiplgt.sh \ + /usr/bin/jiplgt + dosym ../share/${P}/integration/lvmlgt.sh \ + /usr/bin/lvmlgt + dosym ../share/${P}/integration/quintuslgt.sh \ + /usr/bin/quintuslgt + dosym ../share/${P}/integration/scryerlgt.sh \ + /usr/bin/scryerlgt + dosym ../share/${P}/integration/sicstuslgt.sh \ + /usr/bin/sicstuslgt + dosym ../share/${P}/integration/swilgt.sh \ + /usr/bin/swilgt + dosym ../share/${P}/integration/taulgt.sh \ + /usr/bin/taulgt + dosym ../share/${P}/integration/tplgt.sh \ + /usr/bin/tplgt + dosym ../share/${P}/integration/xsblgt.sh \ + /usr/bin/xsblgt + dosym ../share/${P}/integration/yaplgt.sh \ + /usr/bin/yaplgt + + dosym ../share/${P}/tools/lgtdoc/xml/lgt2xml.sh \ + /usr/bin/lgt2xml + use xslt && dosym ../share/${P}/tools/lgtdoc/xml/lgt2html.sh \ + /usr/bin/lgt2html + use xslt && dosym ../share/${P}/tools/lgtdoc/xml/lgt2txt.sh \ + /usr/bin/lgt2txt + use xslt && dosym ../share/${P}/tools/lgtdoc/xml/lgt2md.sh \ + /usr/bin/lgt2md + use fop && dosym ../share/${P}/tools/lgtdoc/xml/lgt2pdf.sh \ + /usr/bin/lgt2pdf + + # Install environment files + echo "LOGTALKHOME=/usr/share/${P}" > 99logtalk + doenvd 99logtalk +} + +pkg_postinst() { + xdg_pkg_postinst + + ewarn "The following integration scripts are installed" + ewarn "for running logtalk with selected Prolog compilers:" + ewarn "B-Prolog: /usr/bin/bplgt" + ewarn "Ciao Prolog: /usr/bin/ciaolgt" + ewarn "CxProlog: /usr/bin/cxlgt" + ewarn "ECLiPSe: /usr/bin/eclipselgt" + ewarn "GNU Prolog: /usr/bin/gplgt" + ewarn "JIProlog: /usr/bin/jiplgt" + ewarn "LVM: /usr/bin/lvmlgt" + ewarn "Quintus Prolog: /usr/bin/quintuslgt" + ewarn "Scryer Prolog: /usr/bin/scryerlgt" + ewarn "SICStus Prolog: /usr/bin/sicstuslgt" + ewarn "SWI Prolog: /usr/bin/swilgt" + ewarn "Tau Prolog: /usr/bin/taulgt" + ewarn "Trealla Prolog: /usr/bin/tplgt" + ewarn "XSB: /usr/bin/xsblgt" + ewarn "YAP: /usr/bin/yaplgt" + ewarn "" + + ewarn "The environment has been set up to make the above" + ewarn "integration scripts find files automatically for logtalk." + ewarn "Please run 'etc-update && source /etc/profile' to update" + ewarn "the environment now, otherwise it will be updated at next" + ewarn "login." +} diff --git a/dev-lang/logtalk/logtalk-3.47.0.ebuild b/dev-lang/logtalk/logtalk-3.47.0.ebuild deleted file mode 100644 index 962a886f27d5..000000000000 --- a/dev-lang/logtalk/logtalk-3.47.0.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit xdg-utils - -DESCRIPTION="Open source object-oriented logic programming language" -HOMEPAGE="https://logtalk.org" -SRC_URI="https://logtalk.org/files/${P}.tar.bz2" -LICENSE="Apache-2.0" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="fop xslt" - -DEPEND="" -RDEPEND="${DEPEND} - xslt? ( dev-libs/libxslt ) - fop? ( dev-java/fop )" - -PATCHES=( - "${FILESDIR}"/${P}-portage.patch -) - -src_install() { - # Look at scripts/install.sh for upstream installation process. - # Install logtalk base - mv scripts/logtalk_user_setup.sh integration/ - mkdir -p "${ED}/usr/share/${P}" || die - cp -r adapters coding contributions core docs examples integration \ - library manuals paths scratch tests tools VERSION.txt \ - loader-sample.lgt settings-sample.lgt tester-sample.lgt \ - tests-sample.lgt \ - "${ED}/usr/share/${P}" \ - || die "Failed to install files" - - # Install mime file, the database will be updated later - insinto /usr/share/mime/packages - doins scripts/freedesktop/logtalk.xml - - # Install documentation - dodoc ACKNOWLEDGMENTS.md BIBLIOGRAPHY.bib CONTRIBUTING.md \ - CUSTOMIZE.md INSTALL.md LICENSE.txt QUICK_START.md \ - README.md RELEASE_NOTES.md UPGRADING.md VERSION.txt - - rm -f man/man1/logtalk_backend_select.1 - rm -f man/man1/logtalk_version_select.1 - doman man/man1/*.1 - - # Integration symlinks - dosym ../share/${P}/integration/logtalk_user_setup.sh \ - /usr/bin/logtalk_user_setup - dosym ../share/${P}/integration/bplgt.sh \ - /usr/bin/bplgt - dosym ../share/${P}/integration/ciaolgt.sh \ - /usr/bin/ciaolgt - dosym ../share/${P}/integration/cxlgt.sh \ - /usr/bin/cxlgt - dosym ../share/${P}/integration/eclipselgt.sh \ - /usr/bin/eclipselgt - dosym ../share/${P}/integration/gplgt.sh \ - /usr/bin/gplgt - dosym ../share/${P}/integration/jiplgt.sh \ - /usr/bin/jiplgt - dosym ../share/${P}/integration/lvmlgt.sh \ - /usr/bin/lvmlgt - dosym ../share/${P}/integration/quintuslgt.sh \ - /usr/bin/quintuslgt - dosym ../share/${P}/integration/scryerlgt.sh \ - /usr/bin/scryerlgt - dosym ../share/${P}/integration/sicstuslgt.sh \ - /usr/bin/sicstuslgt - dosym ../share/${P}/integration/swilgt.sh \ - /usr/bin/swilgt - dosym ../share/${P}/integration/taulgt.sh \ - /usr/bin/taulgt - dosym ../share/${P}/integration/tplgt.sh \ - /usr/bin/tplgt - dosym ../share/${P}/integration/xsblgt.sh \ - /usr/bin/xsblgt - dosym ../share/${P}/integration/yaplgt.sh \ - /usr/bin/yaplgt - - dosym ../share/${P}/tools/lgtdoc/xml/lgt2xml.sh \ - /usr/bin/lgt2xml - use xslt && dosym ../share/${P}/tools/lgtdoc/xml/lgt2html.sh \ - /usr/bin/lgt2html - use xslt && dosym ../share/${P}/tools/lgtdoc/xml/lgt2txt.sh \ - /usr/bin/lgt2txt - use xslt && dosym ../share/${P}/tools/lgtdoc/xml/lgt2md.sh \ - /usr/bin/lgt2md - use fop && dosym ../share/${P}/tools/lgtdoc/xml/lgt2pdf.sh \ - /usr/bin/lgt2pdf - - # Install environment files - echo "LOGTALKHOME=/usr/share/${P}" > 99logtalk - doenvd 99logtalk -} - -pkg_postinst() { - xdg_mimeinfo_database_update - xdg_desktop_database_update - - ewarn "The following integration scripts are installed" - ewarn "for running logtalk with selected Prolog compilers:" - ewarn "B-Prolog: /usr/bin/bplgt" - ewarn "Ciao Prolog: /usr/bin/ciaolgt" - ewarn "CxProlog: /usr/bin/cxlgt" - ewarn "ECLiPSe: /usr/bin/eclipselgt" - ewarn "GNU Prolog: /usr/bin/gplgt" - ewarn "JIProlog: /usr/bin/jiplgt" - ewarn "LVM: /usr/bin/lvmlgt" - ewarn "Quintus Prolog: /usr/bin/quintuslgt" - ewarn "Scryer Prolog: /usr/bin/scryerlgt" - ewarn "SICStus Prolog: /usr/bin/sicstuslgt" - ewarn "SWI Prolog: /usr/bin/swilgt" - ewarn "Tau Prolog: /usr/bin/taulgt" - ewarn "Trealla Prolog: /usr/bin/tplgt" - ewarn "XSB: /usr/bin/xsblgt" - ewarn "YAP: /usr/bin/yaplgt" - ewarn "" - - ewarn "The environment has been set up to make the above" - ewarn "integration scripts find files automatically for logtalk." - ewarn "Please run 'etc-update && source /etc/profile' to update" - ewarn "the environment now, otherwise it will be updated at next" - ewarn "login." -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 644a082dd64e..29a8ddbafa8c 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,5 +1,5 @@ DIST php-8.1.26.tar.xz 11809448 BLAKE2B e1d50f1de572580a207586b3c3b57081f7b9f1b680ffe8f9e82c88c9285af117dd7e9e2576fcb13119176cb9cd02b39481b6f40e9a1df81aa90b8c4d3e59e4b1 SHA512 5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417 -DIST php-8.1.27.tar.xz 11915228 BLAKE2B 83f4f3c25435b26dc526dc1fd7aff44cd03157349f9bb6454e216525a16c2bbc3bfac47cce6b5ea8bfdfcf3c7f27e342fc602ca7d2491fe89db06ea93f686f0e SHA512 07fb2b8e10e2487635e26bfd8a27949a26b85f76bc3984ad8599224bb7a7f9498d84299335ae5a0bba16599275e9747ab141f73f4f2076ddf49ebec8e76fd0ed +DIST php-8.1.28.tar.xz 11848504 BLAKE2B a5deb596176bcd69c33f239e752ac75e2da1538efe6d2b321802c50ea250214c6d9b59e8a5cb74f97f37c917159ef4fde4ccda4403d6e0a6fe751a19b7687472 SHA512 d56ecac164e00e9514cd3c6c8c453598b323118dc7d7ae7cc14ba0847d50a2e455b2391f52e0d81af325b02d8f73a7d2ed66bf66d068dac4a496d777c83a398f DIST php-8.2.15.tar.xz 12075384 BLAKE2B cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4 SHA512 56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166 -DIST php-8.2.17.tar.xz 12092404 BLAKE2B 352ad673c6eb4e827982b822c0d2f50f62b047e759bb056224f83f939b26a2348a36c3fea3950f3c55df2845a5eb56c103ffef5a81f192c07f02fb2cbaefa7a4 SHA512 113cd8c6a481770aba7e21f1bc22500c93dfa41ff85a7b54e1abbfd5b5a32f51501c91eb45c29a5e2d8ec5f61861060c193a96e27224c97f8cad7979f378bde8 -DIST php-8.3.4.tar.xz 12443980 BLAKE2B b3e7c491583081cc24cef24a1adaee91da4454518e6feb1320e3c2fe474c1e84b8cc861d3706976cee0df011da734321ae4ea5336fc17f9c799a6728eb74de44 SHA512 7254421c57de6c8f9f84079212ead38b397e053ad2dc202bd4e0c9d63aa5d9884a6a856fb93fcdbc9e671051436814188439bc5de480979e53fdcb5488cdc321 +DIST php-8.2.18.tar.xz 12089400 BLAKE2B 82a4ef0aee7fa66018cb528e6fc2da40f67be2a75449ed85c54881e6725cfa9fe82d6d5655c12d2e92f3fd685479367b7c038df5af0d7a0a122d627c78c50514 SHA512 8bdd6e5aa19dac80745d258a43f7330a3096d47dc66cbef0054b8f9eb9ace5e87d841a4001185a783241a416975753c922425e977f50b2716ce643b6a7bf351f +DIST php-8.3.6.tar.xz 12468116 BLAKE2B 33d318058123544cbfd95ca65bd75b1eda64757f07af1d0c49eeb98c1ea5f803f1a27f5fe32c983ecdf6f789cef8afc564b384b8537b0a11525cf3ec38373e04 SHA512 fa0b6734e34af90b67bdb991726faa02f7ddd7f31adf73d0b96762452a652690ef5fbae2f6cb941fbd41533b1d6870a78192433e78d5a16a8b5f55b3a5fdf44a diff --git a/dev-lang/php/php-8.1.27-r2.ebuild b/dev-lang/php/php-8.1.27-r2.ebuild deleted file mode 100644 index f434f0df4366..000000000000 --- a/dev-lang/php/php-8.1.27-r2.ebuild +++ /dev/null @@ -1,782 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WANT_AUTOMAKE="none" - -inherit flag-o-matic multilib systemd autotools - -DESCRIPTION="The PHP language runtime engine" -HOMEPAGE="https://www.php.net/" -SRC_URI="https://www.php.net/distributions/${P}.tar.xz" - -LICENSE="PHP-3.01 - BSD - Zend-2.0 - bcmath? ( LGPL-2.1+ ) - fpm? ( BSD-2 ) - gd? ( gd ) - unicode? ( BSD-2 LGPL-2.1 )" - -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2 phpdbg" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar - cdb cjk coverage +ctype curl debug - enchant exif ffi +fileinfo +filter firebird - +flatfile ftp gd gdbm gmp +iconv imap inifile - intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb - mhash mssql mysql mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline selinux +session session-mm sharedmem - +simplexml snmp soap sockets sodium spell sqlite ssl - sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp - +xml xmlreader xmlwriter xpm xslt zip zlib" - -# Without USE=readline or libedit, the interactive "php -a" CLI will hang. -# The Oracle instant client provides its own incompatible ldap library. -REQUIRED_USE=" - || ( cli cgi fpm apache2 embed phpdbg ) - avif? ( gd zlib ) - cli? ( ^^ ( readline libedit ) ) - !cli? ( ?? ( readline libedit ) ) - truetype? ( gd zlib ) - webp? ( gd zlib ) - cjk? ( gd zlib ) - exif? ( gd zlib ) - xpm? ( gd zlib ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - xmlreader? ( xml ) - xmlwriter? ( xml ) - xslt? ( xml ) - ldap-sasl? ( ldap ) - oci8-instant-client? ( !ldap ) - qdbm? ( !gdbm ) - session-mm? ( session !threads ) - mysql? ( || ( mysqli pdo ) ) - firebird? ( pdo ) - mssql? ( pdo ) -" - -RESTRICT="!test? ( test )" - -# The supported (that is, autodetected) versions of BDB are listed in -# the ./configure script. Other versions *work*, but we need to stick to -# the ones that can be detected to avoid a repeat of bug #564824. -COMMON_DEPEND=" - >=app-eselect/eselect-php-0.9.7[apache2?,fpm?] - >=dev-libs/libpcre2-10.30[jit?,unicode] - virtual/libcrypt:= - fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) - apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) - argon2? ( app-crypt/argon2:= ) - avif? ( media-libs/libavif:= ) - berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) - bzip2? ( app-arch/bzip2:0= ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - coverage? ( dev-util/lcov ) - curl? ( >=net-misc/curl-7.29.0 ) - enchant? ( app-text/enchant:2 ) - ffi? ( >=dev-libs/libffi-3.0.11:= ) - firebird? ( dev-db/firebird ) - gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) - gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) - gmp? ( dev-libs/gmp:0= ) - iconv? ( virtual/libiconv ) - imap? ( net-libs/c-client[kerberos=,ssl=] ) - intl? ( dev-libs/icu:= ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-1.2.11:= ) - ldap-sasl? ( dev-libs/cyrus-sasl ) - libedit? ( dev-libs/libedit ) - lmdb? ( dev-db/lmdb:= ) - mssql? ( dev-db/freetds[mssql] ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) - odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) - postgres? ( >=dev-db/postgresql-9.1:* ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline:0= ) - session-mm? ( dev-libs/mm ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - sodium? ( dev-libs/libsodium:=[-minimal(-)] ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-1.0.2:0= ) - tidy? ( app-text/htmltidy ) - tokyocabinet? ( dev-db/tokyocabinet ) - truetype? ( =media-libs/freetype-2* ) - unicode? ( dev-libs/oniguruma:= ) - webp? ( media-libs/libwebp:0= ) - xml? ( >=dev-libs/libxml2-2.9.0 ) - xpm? ( x11-libs/libXpm ) - xslt? ( dev-libs/libxslt ) - zip? ( >=dev-libs/libzip-1.2.0:= ) - zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) -" - -IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]" - -RDEPEND="${COMMON_DEPEND} - virtual/mta - fpm? ( - selinux? ( sec-policy/selinux-phpfpm ) - systemd? ( sys-apps/systemd ) )" - -# Bison isn't actually needed when building from a release tarball -# However, the configure script will warn if it's absent or if you -# have an incompatible version installed. See bug 593278. -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - >=sys-devel/bison-3.0.1" - -BDEPEND="virtual/pkgconfig" - -PHP_MV="$(ver_cut 1)" - -PATCHES=( - "${FILESDIR}/php-iodbc-header-location.patch" - "${FILESDIR}/php-capstone-optional.patch" - "${FILESDIR}/php-8.1.27-gcc14-libxml.patch" - "${FILESDIR}/php-8.1.27-implicit-decls.patch" - "${FILESDIR}/fix-musl-llvm.patch" -) - -# ARM/Windows functions that are expected to be undefined. -QA_CONFIG_IMPL_DECL_SKIP=( - __crc32d - _controlfp - _controlfp_s -) - -# Functions from alternate iconv implementations (bug 925268) -QA_CONFIG_IMPL_DECL_SKIP+=( - iconv_ccs_init - cstoccsid -) - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - # Always install the production INI file, bug 611214. - local phpinisrc="php.ini-production-${phpsapi}" - cp php.ini-production "${phpinisrc}" || die - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \ - -i "${phpinisrc}" || die - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" php.ini - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - - dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" - dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - if use opcache; then - elog "Adding opcache to $PHP_EXT_INI_DIR" - echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ - "${D}/${PHP_EXT_INI_DIR}"/opcache.ini - dosym "../ext/opcache.ini" \ - "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" - fi - - # SAPI-specific handling - if [[ "${sapi}" == "fpm" ]] ; then - einfo "Installing FPM config files php-fpm.conf and www.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - doins sapi/fpm/php-fpm.conf - insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d" - doins sapi/fpm/www.conf - fi - - dodoc php.ini-{development,production} -} - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} - -src_prepare() { - default - - # In php-7.x, the FPM pool configuration files have been split off - # of the main config. By default the pool config files go in - # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the - # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later - # we'll install the pool configuration file "www.conf" there. - php_set_ini_dir fpm - sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ - sapi/fpm/php-fpm.conf.in \ - || die 'failed to move the include directory in php-fpm.conf' - - # Emulate buildconf to support cross-compilation - rm -fr aclocal.m4 autom4te.cache config.cache \ - configure main/php_config.h.in || die - eautoconf --force - eautoheader - - # Remove false positive test failures - # stream_isatty fails due to portage redirects - # curl tests here fail for network sandbox issues - # session tests here fail because we set the session directory to $T - rm tests/output/stream_isatty_err.phpt \ - tests/output/stream_isatty_out-err.phpt \ - tests/output/stream_isatty_out.phpt \ - ext/curl/tests/bug76675.phpt \ - ext/curl/tests/bug77535.phpt \ - ext/curl/tests/curl_error_basic.phpt \ - ext/session/tests/bug74514.phpt \ - ext/session/tests/bug74936.phpt \ - ext/fileinfo/tests/bug78987.phpt || die -} - -src_configure() { - addpredict /usr/share/snmp/mibs/.index #nowarn - addpredict /var/lib/net-snmp/mib_indexes #nowarn - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - # https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527 - filter-lto - - # The php-fpm config file wants localstatedir to be ${EPREFIX}/var - # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. - local our_conf=( - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}/man" - --infodir="${PHP_DESTDIR}/info" - --libdir="${PHP_DESTDIR}/lib" - --with-libdir="$(get_libdir)" - --localstatedir="${EPREFIX}/var" - --without-pear - --without-valgrind - $(use_enable threads zts) - ) - - # The slotted man/info pages will be missed by the default list of - # docompress paths. - docompress "${PHP_DESTDIR}/man" "${PHP_DESTDIR}/info" - - our_conf+=( - $(use_with apparmor fpm-apparmor) - $(use_with argon2 password-argon2 "${EPREFIX}/usr") - $(use_with avif) - $(use_enable bcmath) - $(use_with bzip2 bz2 "${EPREFIX}/usr") - $(use_enable calendar) - $(use_enable coverage gcov) - $(use_enable ctype) - $(use_with curl) - $(use_enable xml dom) - $(use_with enchant) - $(use_enable exif) - $(use_with ffi) - $(use_enable fileinfo) - $(use_enable filter) - $(use_enable ftp) - $(use_with nls gettext "${EPREFIX}/usr") - $(use_with gmp gmp "${EPREFIX}/usr") - $(use_with mhash mhash "${EPREFIX}/usr") - $(use_with iconv iconv \ - $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr")) - $(use_enable intl) - $(use_enable ipv6) - $(use_with kerberos) - $(use_with xml libxml) - $(use_enable unicode mbstring) - $(use_with ssl openssl) - $(use_enable pcntl) - $(use_enable phar) - $(use_enable pdo) - $(use_enable opcache) - $(use_with postgres pgsql "${EPREFIX}/usr") - $(use_enable posix) - $(use_with spell pspell "${EPREFIX}/usr") - $(use_enable simplexml) - $(use_enable sharedmem shmop) - $(use_with snmp snmp "${EPREFIX}/usr") - $(use_enable soap) - $(use_enable sockets) - $(use_with sodium) - $(use_with sqlite sqlite3) - $(use_enable sysvipc sysvmsg) - $(use_enable sysvipc sysvsem) - $(use_enable sysvipc sysvshm) - $(use_with tidy tidy "${EPREFIX}/usr") - $(use_enable tokenizer) - $(use_enable xml) - $(use_enable xmlreader) - $(use_enable xmlwriter) - $(use_with xslt xsl) - $(use_with zip) - $(use_with zlib zlib "${EPREFIX}/usr") - $(use_enable debug) - ) - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm || use lmdb || use tokyocabinet ; then - our_conf+=( "--enable-dba" ) - fi - - # DBA drivers support - our_conf+=( - $(use_with cdb) - $(use_with berkdb db4 "${EPREFIX}/usr") - $(use_enable flatfile) - $(use_with gdbm gdbm "${EPREFIX}/usr") - $(use_enable inifile) - $(use_with qdbm qdbm "${EPREFIX}/usr") - $(use_with tokyocabinet tcadb "${EPREFIX}/usr") - $(use_with lmdb lmdb "${EPREFIX}/usr") - ) - - # Support for the GD graphics library - our_conf+=( - $(use_with truetype freetype) - $(use_enable cjk gd-jis-conv) - $(use_with gd jpeg) - $(use_with xpm) - $(use_with webp) - ) - # enable gd last, so configure can pick up the previous settings - our_conf+=( $(use_enable gd) ) - - # IMAP support - if use imap ; then - our_conf+=( - $(use_with imap imap "${EPREFIX}/usr") - $(use_with ssl imap-ssl "${EPREFIX}/usr") - ) - fi - - # LDAP support - if use ldap ; then - our_conf+=( - $(use_with ldap ldap "${EPREFIX}/usr") - $(use_with ldap-sasl) - ) - fi - - # MySQL support - our_conf+=( $(use_with mysqli mysqli "mysqlnd") ) - - local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" - if use mysql || use mysqli ; then - our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) - fi - - # ODBC support - if use odbc && use iodbc ; then - our_conf+=( - --without-unixODBC - --with-iodbc - $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr") - ) - elif use odbc ; then - our_conf+=( - --with-unixODBC="${EPREFIX}/usr" - --without-iodbc - $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr") - ) - else - our_conf+=( - --without-unixODBC - --without-iodbc - --without-pdo-odbc - ) - fi - - # Oracle support - our_conf+=( $(use_with oci8-instant-client oci8) ) - - # PDO support - if use pdo ; then - our_conf+=( - $(use_with mssql pdo-dblib "${EPREFIX}/usr") - $(use_with mysql pdo-mysql "mysqlnd") - $(use_with postgres pdo-pgsql) - $(use_with sqlite pdo-sqlite) - $(use_with firebird pdo-firebird "${EPREFIX}/usr") - $(use_with oci8-instant-client pdo-oci) - ) - fi - - # readline/libedit support - our_conf+=( - $(use_with readline readline "${EPREFIX}/usr") - $(use_with libedit) - ) - - # Session support - if use session ; then - our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) - else - our_conf+=( $(use_enable session) ) - fi - - # Use pic for shared modules such as apache2's mod_php - our_conf+=( --with-pic ) - - # we use the system copy of pcre - # --with-external-pcre affects ext/pcre - our_conf+=( - --with-external-pcre - $(use_with jit pcre-jit) - ) - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Cache the ./configure test results between SAPIs. - our_conf+=( --cache-file="${T}/config.cache" ) - - # Support user-passed configuration parameters - our_conf+=( ${EXTRA_ECONF:-} ) - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - local one_sapi - local sapi - mkdir -p "${WORKDIR}/sapis-build" || die - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - # The BUILD_DIR variable is used to determine where to output - # the files that autotools creates. This was all originally - # based on the autotools-utils eclass. - BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" - cp -a "${S}" "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - local sapi_conf=( - --with-config-file-path="${PHP_INI_DIR}" - --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" - ) - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm|phpdbg) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( "--enable-${sapi}" ) - if [[ "fpm" == "${sapi}" ]] ; then - sapi_conf+=( - $(use_with acl fpm-acl) - $(use_with systemd fpm-systemd) - ) - fi - else - sapi_conf+=( "--disable-${sapi}" ) - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) - else - sapi_conf+=( --without-apxs2 ) - fi - ;; - esac - done - - # Construct the $myeconfargs array by concatenating $our_conf - # (the common args) and $sapi_conf (the SAPI-specific args). - local myeconfargs=( "${our_conf[@]}" ) - myeconfargs+=( "${sapi_conf[@]}" ) - - pushd "${BUILD_DIR}" > /dev/null || die - econf "${myeconfargs[@]}" - popd > /dev/null || die - done -} - -src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index #nowarn - addpredict /var/lib/net-snmp/mib_indexes #nowarn - - local sapi - for sapi in ${SAPIS} ; do - if use "${sapi}"; then - cd "${WORKDIR}/sapis-build/$sapi" || \ - die "Failed to change dir to ${WORKDIR}/sapis-build/$1" - emake - fi - done -} - -src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index #nowarn - - # grab the first SAPI that got built and install common files from there - local first_sapi="", sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" || die - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir "/usr/share/php${PHP_MV}" - - local file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" || die - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp$(get_libname)" \ - "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - local dest="${PHP_DESTDIR#${EPREFIX}}" - into "${dest}" - case "$sapi" in - cli) - source="sapi/cli/php" - # Install the "phar" archive utility. - if use phar ; then - emake INSTALL_ROOT="${D}" install-pharcmd - dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}" - fi - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp$(get_libname)" - ;; - phpdbg) - source="sapi/phpdbg/phpdbg" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" - else - dobin "${source}" - local name="$(basename ${source})" - dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Installing opcache module - if use opcache ; then - into "${PHP_DESTDIR#${EPREFIX}}" - dolib.so "modules/opcache$(get_libname)" - fi - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die - - if use fpm ; then - if use systemd; then - systemd_newunit "${FILESDIR}/php-fpm_at.service" \ - "php-fpm@${SLOT}.service" - else - systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ - "php-fpm@${SLOT}.service" - fi - fi -} - -src_test() { - echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" - fi - - if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then - export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" - fi - - SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ - "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ - "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null || die - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - elog - elog "To enable PHP in apache, you will need to add \"-D PHP\" to" - elog "your apache2 command. OpenRC users can append that string to" - elog "APACHE2_OPTS in /etc/conf.d/apache2." - elog - elog "The apache module configuration file 70_mod_php.conf is" - elog "provided (and maintained) by eselect-php." - elog - fi - - # Create the symlinks for php - local m - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} || die - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - # Remove dead symlinks for SAPIs that were just disabled. For - # example, if the user has the cgi SAPI enabled, then he has an - # eselect-php symlink for it. If he later reinstalls PHP with - # USE="-cgi", that symlink will break. This call to eselect is - # supposed to remove that dead link per bug 572436. - eselect php cleanup || die - - if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then - elog "To build extensions for this version of PHP, you will need to" - elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." - elog - fi - - # Warn about the removal of PHP_INI_VERSION if the user has it set. - if [[ -n "${PHP_INI_VERSION}" ]]; then - ewarn 'The PHP_INI_VERSION variable has been phased out. You may' - ewarn 'remove it from your configuration at your convenience. See' - ewarn - ewarn ' https://bugs.gentoo.org/611214' - ewarn - ewarn 'for more information.' - fi - - elog "For details on how version slotting works, please see" - elog "the wiki:" - elog - elog " https://wiki.gentoo.org/wiki/PHP" - elog -} - -pkg_postrm() { - # This serves two purposes. First, if we have just removed the last - # installed version of PHP, then this will remove any dead symlinks - # belonging to eselect-php. Second, if a user upgrades slots from - # (say) 5.6 to 7.0 and depcleans the old slot, then this will update - # his existing symlinks to point to the new 7.0 installation. The - # latter is bug 432962. - # - # Note: the eselect-php package may not be installed at this point, - # so we can't die() if this command fails. - eselect php cleanup -} diff --git a/dev-lang/php/php-8.1.28.ebuild b/dev-lang/php/php-8.1.28.ebuild new file mode 100644 index 000000000000..64589a10d000 --- /dev/null +++ b/dev-lang/php/php-8.1.28.ebuild @@ -0,0 +1,782 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WANT_AUTOMAKE="none" + +inherit flag-o-matic multilib systemd autotools + +DESCRIPTION="The PHP language runtime engine" +HOMEPAGE="https://www.php.net/" +SRC_URI="https://www.php.net/distributions/${P}.tar.xz" + +LICENSE="PHP-3.01 + BSD + Zend-2.0 + bcmath? ( LGPL-2.1+ ) + fpm? ( BSD-2 ) + gd? ( gd ) + unicode? ( BSD-2 LGPL-2.1 )" + +SLOT="$(ver_cut 1-2)" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +# We can build the following SAPIs in the given order +SAPIS="embed cli cgi fpm apache2 phpdbg" + +# SAPIs and SAPI-specific USE flags (cli SAPI is default on): +IUSE="${IUSE} + ${SAPIS/cli/+cli} + threads" + +IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar + cdb cjk coverage +ctype curl debug + enchant exif ffi +fileinfo +filter firebird + +flatfile ftp gd gdbm gmp +iconv imap inifile + intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb + mhash mssql mysql mysqli nls + oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm + readline selinux +session session-mm sharedmem + +simplexml snmp soap sockets sodium spell sqlite ssl + sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp + +xml xmlreader xmlwriter xpm xslt zip zlib" + +# Without USE=readline or libedit, the interactive "php -a" CLI will hang. +# The Oracle instant client provides its own incompatible ldap library. +REQUIRED_USE=" + || ( cli cgi fpm apache2 embed phpdbg ) + avif? ( gd zlib ) + cli? ( ^^ ( readline libedit ) ) + !cli? ( ?? ( readline libedit ) ) + truetype? ( gd zlib ) + webp? ( gd zlib ) + cjk? ( gd zlib ) + exif? ( gd zlib ) + xpm? ( gd zlib ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + xmlreader? ( xml ) + xmlwriter? ( xml ) + xslt? ( xml ) + ldap-sasl? ( ldap ) + oci8-instant-client? ( !ldap ) + qdbm? ( !gdbm ) + session-mm? ( session !threads ) + mysql? ( || ( mysqli pdo ) ) + firebird? ( pdo ) + mssql? ( pdo ) +" + +RESTRICT="!test? ( test )" + +# The supported (that is, autodetected) versions of BDB are listed in +# the ./configure script. Other versions *work*, but we need to stick to +# the ones that can be detected to avoid a repeat of bug #564824. +COMMON_DEPEND=" + >=app-eselect/eselect-php-0.9.7[apache2?,fpm?] + >=dev-libs/libpcre2-10.30[jit?,unicode] + virtual/libcrypt:= + fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) + argon2? ( app-crypt/argon2:= ) + avif? ( media-libs/libavif:= ) + berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) + bzip2? ( app-arch/bzip2:0= ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + coverage? ( dev-util/lcov ) + curl? ( >=net-misc/curl-7.29.0 ) + enchant? ( app-text/enchant:2 ) + ffi? ( >=dev-libs/libffi-3.0.11:= ) + firebird? ( dev-db/firebird ) + gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) + gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) + gmp? ( dev-libs/gmp:0= ) + iconv? ( virtual/libiconv ) + imap? ( net-libs/c-client[kerberos=,ssl=] ) + intl? ( dev-libs/icu:= ) + kerberos? ( virtual/krb5 ) + ldap? ( >=net-nds/openldap-1.2.11:= ) + ldap-sasl? ( dev-libs/cyrus-sasl ) + libedit? ( dev-libs/libedit ) + lmdb? ( dev-db/lmdb:= ) + mssql? ( dev-db/freetds[mssql] ) + nls? ( sys-devel/gettext ) + oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) + odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) + postgres? ( >=dev-db/postgresql-9.1:* ) + qdbm? ( dev-db/qdbm ) + readline? ( sys-libs/readline:0= ) + session-mm? ( dev-libs/mm ) + snmp? ( >=net-analyzer/net-snmp-5.2 ) + sodium? ( dev-libs/libsodium:=[-minimal(-)] ) + spell? ( >=app-text/aspell-0.50 ) + sqlite? ( >=dev-db/sqlite-3.7.6.3 ) + ssl? ( >=dev-libs/openssl-1.0.2:0= ) + tidy? ( app-text/htmltidy ) + tokyocabinet? ( dev-db/tokyocabinet ) + truetype? ( =media-libs/freetype-2* ) + unicode? ( dev-libs/oniguruma:= ) + webp? ( media-libs/libwebp:0= ) + xml? ( >=dev-libs/libxml2-2.9.0 ) + xpm? ( x11-libs/libXpm ) + xslt? ( dev-libs/libxslt ) + zip? ( >=dev-libs/libzip-1.2.0:= ) + zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) +" + +IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]" + +RDEPEND="${COMMON_DEPEND} + virtual/mta + fpm? ( + selinux? ( sec-policy/selinux-phpfpm ) + systemd? ( sys-apps/systemd ) )" + +# Bison isn't actually needed when building from a release tarball +# However, the configure script will warn if it's absent or if you +# have an incompatible version installed. See bug 593278. +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + >=sys-devel/bison-3.0.1" + +BDEPEND="virtual/pkgconfig" + +PHP_MV="$(ver_cut 1)" + +PATCHES=( + "${FILESDIR}/php-iodbc-header-location.patch" + "${FILESDIR}/php-capstone-optional.patch" + "${FILESDIR}/php-8.1.27-gcc14-libxml.patch" + "${FILESDIR}/php-8.1.27-implicit-decls.patch" + "${FILESDIR}/fix-musl-llvm.patch" +) + +# ARM/Windows functions that are expected to be undefined. +QA_CONFIG_IMPL_DECL_SKIP=( + __crc32d + _controlfp + _controlfp_s +) + +# Functions from alternate iconv implementations (bug 925268) +QA_CONFIG_IMPL_DECL_SKIP+=( + iconv_ccs_init + cstoccsid +) + +php_install_ini() { + local phpsapi="${1}" + + # work out where we are installing the ini file + php_set_ini_dir "${phpsapi}" + + # Always install the production INI file, bug 611214. + local phpinisrc="php.ini-production-${phpsapi}" + cp php.ini-production "${phpinisrc}" || die + + # default to /tmp for save_path, bug #282768 + sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \ + -i "${phpinisrc}" || die + + # Set the include path to point to where we want to find PEAR packages + sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die + + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" php.ini + + elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + + dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" + dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + if use opcache; then + elog "Adding opcache to $PHP_EXT_INI_DIR" + echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ + "${D}/${PHP_EXT_INI_DIR}"/opcache.ini + dosym "../ext/opcache.ini" \ + "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" + fi + + # SAPI-specific handling + if [[ "${sapi}" == "fpm" ]] ; then + einfo "Installing FPM config files php-fpm.conf and www.conf" + insinto "${PHP_INI_DIR#${EPREFIX}}" + doins sapi/fpm/php-fpm.conf + insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d" + doins sapi/fpm/www.conf + fi + + dodoc php.ini-{development,production} +} + +php_set_ini_dir() { + PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" + PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" + PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" +} + +src_prepare() { + default + + # In php-7.x, the FPM pool configuration files have been split off + # of the main config. By default the pool config files go in + # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the + # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later + # we'll install the pool configuration file "www.conf" there. + php_set_ini_dir fpm + sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ + sapi/fpm/php-fpm.conf.in \ + || die 'failed to move the include directory in php-fpm.conf' + + # Emulate buildconf to support cross-compilation + rm -fr aclocal.m4 autom4te.cache config.cache \ + configure main/php_config.h.in || die + eautoconf --force + eautoheader + + # Remove false positive test failures + # stream_isatty fails due to portage redirects + # curl tests here fail for network sandbox issues + # session tests here fail because we set the session directory to $T + rm tests/output/stream_isatty_err.phpt \ + tests/output/stream_isatty_out-err.phpt \ + tests/output/stream_isatty_out.phpt \ + ext/curl/tests/bug76675.phpt \ + ext/curl/tests/bug77535.phpt \ + ext/curl/tests/curl_error_basic.phpt \ + ext/session/tests/bug74514.phpt \ + ext/session/tests/bug74936.phpt \ + ext/fileinfo/tests/bug78987.phpt || die +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" + + # https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527 + filter-lto + + # The php-fpm config file wants localstatedir to be ${EPREFIX}/var + # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. + local our_conf=( + --prefix="${PHP_DESTDIR}" + --mandir="${PHP_DESTDIR}/man" + --infodir="${PHP_DESTDIR}/info" + --libdir="${PHP_DESTDIR}/lib" + --with-libdir="$(get_libdir)" + --localstatedir="${EPREFIX}/var" + --without-pear + --without-valgrind + $(use_enable threads zts) + ) + + # The slotted man/info pages will be missed by the default list of + # docompress paths. + docompress "${PHP_DESTDIR}/man" "${PHP_DESTDIR}/info" + + our_conf+=( + $(use_with apparmor fpm-apparmor) + $(use_with argon2 password-argon2 "${EPREFIX}/usr") + $(use_with avif) + $(use_enable bcmath) + $(use_with bzip2 bz2 "${EPREFIX}/usr") + $(use_enable calendar) + $(use_enable coverage gcov) + $(use_enable ctype) + $(use_with curl) + $(use_enable xml dom) + $(use_with enchant) + $(use_enable exif) + $(use_with ffi) + $(use_enable fileinfo) + $(use_enable filter) + $(use_enable ftp) + $(use_with nls gettext "${EPREFIX}/usr") + $(use_with gmp gmp "${EPREFIX}/usr") + $(use_with mhash mhash "${EPREFIX}/usr") + $(use_with iconv iconv \ + $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr")) + $(use_enable intl) + $(use_enable ipv6) + $(use_with kerberos) + $(use_with xml libxml) + $(use_enable unicode mbstring) + $(use_with ssl openssl) + $(use_enable pcntl) + $(use_enable phar) + $(use_enable pdo) + $(use_enable opcache) + $(use_with postgres pgsql "${EPREFIX}/usr") + $(use_enable posix) + $(use_with spell pspell "${EPREFIX}/usr") + $(use_enable simplexml) + $(use_enable sharedmem shmop) + $(use_with snmp snmp "${EPREFIX}/usr") + $(use_enable soap) + $(use_enable sockets) + $(use_with sodium) + $(use_with sqlite sqlite3) + $(use_enable sysvipc sysvmsg) + $(use_enable sysvipc sysvsem) + $(use_enable sysvipc sysvshm) + $(use_with tidy tidy "${EPREFIX}/usr") + $(use_enable tokenizer) + $(use_enable xml) + $(use_enable xmlreader) + $(use_enable xmlwriter) + $(use_with xslt xsl) + $(use_with zip) + $(use_with zlib zlib "${EPREFIX}/usr") + $(use_enable debug) + ) + + # DBA support + if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ + || use qdbm || use lmdb || use tokyocabinet ; then + our_conf+=( "--enable-dba" ) + fi + + # DBA drivers support + our_conf+=( + $(use_with cdb) + $(use_with berkdb db4 "${EPREFIX}/usr") + $(use_enable flatfile) + $(use_with gdbm gdbm "${EPREFIX}/usr") + $(use_enable inifile) + $(use_with qdbm qdbm "${EPREFIX}/usr") + $(use_with tokyocabinet tcadb "${EPREFIX}/usr") + $(use_with lmdb lmdb "${EPREFIX}/usr") + ) + + # Support for the GD graphics library + our_conf+=( + $(use_with truetype freetype) + $(use_enable cjk gd-jis-conv) + $(use_with gd jpeg) + $(use_with xpm) + $(use_with webp) + ) + # enable gd last, so configure can pick up the previous settings + our_conf+=( $(use_enable gd) ) + + # IMAP support + if use imap ; then + our_conf+=( + $(use_with imap imap "${EPREFIX}/usr") + $(use_with ssl imap-ssl "${EPREFIX}/usr") + ) + fi + + # LDAP support + if use ldap ; then + our_conf+=( + $(use_with ldap ldap "${EPREFIX}/usr") + $(use_with ldap-sasl) + ) + fi + + # MySQL support + our_conf+=( $(use_with mysqli mysqli "mysqlnd") ) + + local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" + if use mysql || use mysqli ; then + our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) + fi + + # ODBC support + if use odbc && use iodbc ; then + our_conf+=( + --without-unixODBC + --with-iodbc + $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr") + ) + elif use odbc ; then + our_conf+=( + --with-unixODBC="${EPREFIX}/usr" + --without-iodbc + $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr") + ) + else + our_conf+=( + --without-unixODBC + --without-iodbc + --without-pdo-odbc + ) + fi + + # Oracle support + our_conf+=( $(use_with oci8-instant-client oci8) ) + + # PDO support + if use pdo ; then + our_conf+=( + $(use_with mssql pdo-dblib "${EPREFIX}/usr") + $(use_with mysql pdo-mysql "mysqlnd") + $(use_with postgres pdo-pgsql) + $(use_with sqlite pdo-sqlite) + $(use_with firebird pdo-firebird "${EPREFIX}/usr") + $(use_with oci8-instant-client pdo-oci) + ) + fi + + # readline/libedit support + our_conf+=( + $(use_with readline readline "${EPREFIX}/usr") + $(use_with libedit) + ) + + # Session support + if use session ; then + our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) + else + our_conf+=( $(use_enable session) ) + fi + + # Use pic for shared modules such as apache2's mod_php + our_conf+=( --with-pic ) + + # we use the system copy of pcre + # --with-external-pcre affects ext/pcre + our_conf+=( + --with-external-pcre + $(use_with jit pcre-jit) + ) + + # Catch CFLAGS problems + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" + + # Cache the ./configure test results between SAPIs. + our_conf+=( --cache-file="${T}/config.cache" ) + + # Support user-passed configuration parameters + our_conf+=( ${EXTRA_ECONF:-} ) + + # Support the Apache2 extras, they must be set globally for all + # SAPIs to work correctly, especially for external PHP extensions + + local one_sapi + local sapi + mkdir -p "${WORKDIR}/sapis-build" || die + for one_sapi in $SAPIS ; do + use "${one_sapi}" || continue + php_set_ini_dir "${one_sapi}" + + # The BUILD_DIR variable is used to determine where to output + # the files that autotools creates. This was all originally + # based on the autotools-utils eclass. + BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" + cp -a "${S}" "${BUILD_DIR}" || die + cd "${BUILD_DIR}" || die + + local sapi_conf=( + --with-config-file-path="${PHP_INI_DIR}" + --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" + ) + + for sapi in $SAPIS ; do + case "$sapi" in + cli|cgi|embed|fpm|phpdbg) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf+=( "--enable-${sapi}" ) + if [[ "fpm" == "${sapi}" ]] ; then + sapi_conf+=( + $(use_with acl fpm-acl) + $(use_with systemd fpm-systemd) + ) + fi + else + sapi_conf+=( "--disable-${sapi}" ) + fi + ;; + + apache2) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) + else + sapi_conf+=( --without-apxs2 ) + fi + ;; + esac + done + + # Construct the $myeconfargs array by concatenating $our_conf + # (the common args) and $sapi_conf (the SAPI-specific args). + local myeconfargs=( "${our_conf[@]}" ) + myeconfargs+=( "${sapi_conf[@]}" ) + + pushd "${BUILD_DIR}" > /dev/null || die + econf "${myeconfargs[@]}" + popd > /dev/null || die + done +} + +src_compile() { + # snmp seems to run during src_compile, too (bug #324739) + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + local sapi + for sapi in ${SAPIS} ; do + if use "${sapi}"; then + cd "${WORKDIR}/sapis-build/$sapi" || \ + die "Failed to change dir to ${WORKDIR}/sapis-build/$1" + emake + fi + done +} + +src_install() { + # see bug #324739 for what happens when we don't have that + addpredict /usr/share/snmp/mibs/.index #nowarn + + # grab the first SAPI that got built and install common files from there + local first_sapi="", sapi="" + for sapi in $SAPIS ; do + if use $sapi ; then + first_sapi=$sapi + break + fi + done + + # Makefile forgets to create this before trying to write to it... + dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" || die + emake INSTALL_ROOT="${D}" \ + install-build install-headers install-programs + + local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # Create the directory where we'll put version-specific php scripts + keepdir "/usr/share/php${PHP_MV}" + + local file="" + local sapi_list="" + + for sapi in ${SAPIS}; do + if use "${sapi}" ; then + einfo "Installing SAPI: ${sapi}" + cd "${WORKDIR}/sapis-build/${sapi}" || die + + if [[ "${sapi}" == "apache2" ]] ; then + # We're specifically not using emake install-sapi as libtool + # may cause unnecessary relink failures (see bug #351266) + insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" + newins ".libs/libphp$(get_libname)" \ + "libphp${PHP_MV}$(get_libname)" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + # needed each time, php_install_ini would reset it + local dest="${PHP_DESTDIR#${EPREFIX}}" + into "${dest}" + case "$sapi" in + cli) + source="sapi/cli/php" + # Install the "phar" archive utility. + if use phar ; then + emake INSTALL_ROOT="${D}" install-pharcmd + dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}" + fi + ;; + cgi) + source="sapi/cgi/php-cgi" + ;; + fpm) + source="sapi/fpm/php-fpm" + ;; + embed) + source="libs/libphp$(get_libname)" + ;; + phpdbg) + source="sapi/phpdbg/phpdbg" + ;; + *) + die "unhandled sapi in src_install" + ;; + esac + + if [[ "${source}" == *"$(get_libname)" ]]; then + dolib.so "${source}" + else + dobin "${source}" + local name="$(basename ${source})" + dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}" + fi + fi + + php_install_ini "${sapi}" + + # construct correct SAPI string for php-config + # thanks to ferringb for the bash voodoo + if [[ "${sapi}" == "apache2" ]]; then + sapi_list="${sapi_list:+${sapi_list} }apache2handler" + else + sapi_list="${sapi_list:+${sapi_list} }${sapi}" + fi + fi + done + + # Installing opcache module + if use opcache ; then + into "${PHP_DESTDIR#${EPREFIX}}" + dolib.so "modules/opcache$(get_libname)" + fi + + # Install env.d files + newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die + sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ + "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die + + if use fpm ; then + if use systemd; then + systemd_newunit "${FILESDIR}/php-fpm_at.service" \ + "php-fpm@${SLOT}.service" + else + systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ + "php-fpm@${SLOT}.service" + fi + fi +} + +src_test() { + echo ">>> Test phase [test]: ${CATEGORY}/${PF}" + PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" + if [[ ! -x "${PHP_BIN}" ]] ; then + ewarn "Test phase requires USE=cli, skipping" + return + else + export TEST_PHP_EXECUTABLE="${PHP_BIN}" + fi + + if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" + fi + + if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then + export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" + fi + + SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ + "session.save_path=${T}" \ + "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ + "session.save_path=${T}" + + for name in ${EXPECTED_TEST_FAILURES}; do + mv "${name}.out" "${name}.out.orig" 2>/dev/null || die + done + + local failed="$(find -name '*.out')" + if [[ ${failed} != "" ]] ; then + ewarn "The following test cases failed unexpectedly:" + for name in ${failed}; do + ewarn " ${name/.out/}" + done + else + einfo "No unexpected test failures, all fine" + fi + + if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then + local passed="" + for name in ${EXPECTED_TEST_FAILURES}; do + [[ -f "${name}.diff" ]] && continue + passed="${passed} ${name}" + done + if [[ ${passed} != "" ]] ; then + einfo "The following test cases passed unexpectedly:" + for name in ${passed}; do + ewarn " ${passed}" + done + else + einfo "None of the known-to-fail tests passed, all fine" + fi + fi +} + +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + elog + elog "To enable PHP in apache, you will need to add \"-D PHP\" to" + elog "your apache2 command. OpenRC users can append that string to" + elog "APACHE2_OPTS in /etc/conf.d/apache2." + elog + elog "The apache module configuration file 70_mod_php.conf is" + elog "provided (and maintained) by eselect-php." + elog + fi + + # Create the symlinks for php + local m + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} || die + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + # Remove dead symlinks for SAPIs that were just disabled. For + # example, if the user has the cgi SAPI enabled, then he has an + # eselect-php symlink for it. If he later reinstalls PHP with + # USE="-cgi", that symlink will break. This call to eselect is + # supposed to remove that dead link per bug 572436. + eselect php cleanup || die + + if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then + elog "To build extensions for this version of PHP, you will need to" + elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." + elog + fi + + # Warn about the removal of PHP_INI_VERSION if the user has it set. + if [[ -n "${PHP_INI_VERSION}" ]]; then + ewarn 'The PHP_INI_VERSION variable has been phased out. You may' + ewarn 'remove it from your configuration at your convenience. See' + ewarn + ewarn ' https://bugs.gentoo.org/611214' + ewarn + ewarn 'for more information.' + fi + + elog "For details on how version slotting works, please see" + elog "the wiki:" + elog + elog " https://wiki.gentoo.org/wiki/PHP" + elog +} + +pkg_postrm() { + # This serves two purposes. First, if we have just removed the last + # installed version of PHP, then this will remove any dead symlinks + # belonging to eselect-php. Second, if a user upgrades slots from + # (say) 5.6 to 7.0 and depcleans the old slot, then this will update + # his existing symlinks to point to the new 7.0 installation. The + # latter is bug 432962. + # + # Note: the eselect-php package may not be installed at this point, + # so we can't die() if this command fails. + eselect php cleanup +} diff --git a/dev-lang/php/php-8.2.15.ebuild b/dev-lang/php/php-8.2.15.ebuild index 38a2c837e671..bb0e5f666f8f 100644 --- a/dev-lang/php/php-8.2.15.ebuild +++ b/dev-lang/php/php-8.2.15.ebuild @@ -20,7 +20,7 @@ LICENSE="PHP-3.01 unicode? ( BSD-2 LGPL-2.1 )" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" @@ -308,6 +308,12 @@ src_prepare() { # https://github.com/php/php-src/issues/12801 rm ext/pcre/tests/gh11374.phpt || die + + # This is a memory usage test with hard-coded limits. Whenever the + # limits are surpassed... they get increased... but in the meantime, + # the tests fail. This is not really a test that end users should + # be running pre-install, in my opinion. Bug 927461. + rm ext/fileinfo/tests/bug78987.phpt || die } src_configure() { diff --git a/dev-lang/php/php-8.2.17.ebuild b/dev-lang/php/php-8.2.17.ebuild deleted file mode 100644 index abe657f95e1d..000000000000 --- a/dev-lang/php/php-8.2.17.ebuild +++ /dev/null @@ -1,860 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WANT_AUTOMAKE="none" - -inherit flag-o-matic multilib systemd autotools - -DESCRIPTION="The PHP language runtime engine" -HOMEPAGE="https://www.php.net/" -SRC_URI="https://www.php.net/distributions/${P}.tar.xz" - -LICENSE="PHP-3.01 - BSD - Zend-2.0 - bcmath? ( LGPL-2.1+ ) - fpm? ( BSD-2 ) - gd? ( gd ) - unicode? ( BSD-2 LGPL-2.1 )" - -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2 phpdbg" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar - cdb cjk +ctype curl debug - enchant exif ffi +fileinfo +filter firebird - +flatfile ftp gd gdbm gmp +iconv imap inifile - intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb - mhash mssql mysql mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline selinux +session session-mm sharedmem - +simplexml snmp soap sockets sodium spell sqlite ssl - sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode - valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib" - -# Without USE=readline or libedit, the interactive "php -a" CLI will hang. -# The Oracle instant client provides its own incompatible ldap library. -REQUIRED_USE=" - || ( cli cgi fpm apache2 embed phpdbg ) - avif? ( gd zlib ) - cli? ( ^^ ( readline libedit ) ) - !cli? ( ?? ( readline libedit ) ) - truetype? ( gd zlib ) - webp? ( gd zlib ) - cjk? ( gd zlib ) - exif? ( gd zlib ) - xpm? ( gd zlib ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - xmlreader? ( xml ) - xmlwriter? ( xml ) - xslt? ( xml ) - ldap-sasl? ( ldap ) - oci8-instant-client? ( !ldap ) - qdbm? ( !gdbm ) - session-mm? ( session !threads ) - mysql? ( || ( mysqli pdo ) ) - firebird? ( pdo ) - mssql? ( pdo ) - test? ( cli ) -" - -RESTRICT="!test? ( test )" - -# The supported (that is, autodetected) versions of BDB are listed in -# the ./configure script. Other versions *work*, but we need to stick to -# the ones that can be detected to avoid a repeat of bug #564824. -COMMON_DEPEND=" - >=app-eselect/eselect-php-0.9.7[apache2?,fpm?] - >=dev-libs/libpcre2-10.30[jit?,unicode] - virtual/libcrypt:= - fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) - apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) - argon2? ( app-crypt/argon2:= ) - avif? ( media-libs/libavif:= ) - berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) - bzip2? ( app-arch/bzip2:0= ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - curl? ( >=net-misc/curl-7.29.0 ) - enchant? ( app-text/enchant:2 ) - ffi? ( >=dev-libs/libffi-3.0.11:= ) - firebird? ( dev-db/firebird ) - gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) - gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) - gmp? ( dev-libs/gmp:0= ) - iconv? ( virtual/libiconv ) - imap? ( net-libs/c-client[kerberos=,ssl=] ) - intl? ( dev-libs/icu:= ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-1.2.11:= ) - ldap-sasl? ( dev-libs/cyrus-sasl ) - libedit? ( dev-libs/libedit ) - lmdb? ( dev-db/lmdb:= ) - mssql? ( dev-db/freetds[mssql] ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) - odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) - postgres? ( >=dev-db/postgresql-9.1:* ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline:0= ) - session-mm? ( dev-libs/mm ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - sodium? ( dev-libs/libsodium:=[-minimal(-)] ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-1.0.2:0= ) - tidy? ( app-text/htmltidy ) - tokyocabinet? ( dev-db/tokyocabinet ) - truetype? ( =media-libs/freetype-2* ) - unicode? ( dev-libs/oniguruma:= ) - valgrind? ( dev-debug/valgrind ) - webp? ( media-libs/libwebp:0= ) - xml? ( >=dev-libs/libxml2-2.9.0 ) - xpm? ( x11-libs/libXpm ) - xslt? ( dev-libs/libxslt ) - zip? ( >=dev-libs/libzip-1.2.0:= ) - zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) -" - -IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]" - -RDEPEND="${COMMON_DEPEND} - virtual/mta - fpm? ( - selinux? ( sec-policy/selinux-phpfpm ) - systemd? ( sys-apps/systemd ) )" - -# Bison isn't actually needed when building from a release tarball -# However, the configure script will warn if it's absent or if you -# have an incompatible version installed. See bug 593278. -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - >=sys-devel/bison-3.0.1" - -BDEPEND="virtual/pkgconfig" - -PHP_MV="$(ver_cut 1)" - -PATCHES=( - "${FILESDIR}/php-iodbc-header-location.patch" - "${FILESDIR}/php-capstone-optional.patch" - "${FILESDIR}/php-8.2.8-openssl-tests.patch" - "${FILESDIR}/php-8.1.27-implicit-decls.patch" - "${FILESDIR}/fix-musl-llvm.patch" -) - -# ARM/Windows functions (bug 923335) -QA_CONFIG_IMPL_DECL_SKIP=( - __crc32d - _controlfp - _controlfp_s -) - -# Functions from alternate iconv implementations (bug 925268) -QA_CONFIG_IMPL_DECL_SKIP+=( - iconv_ccs_init - cstoccsid -) - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - # Always install the production INI file, bug 611214. - local phpinisrc="php.ini-production-${phpsapi}" - cp php.ini-production "${phpinisrc}" || die - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \ - -i "${phpinisrc}" || die - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" php.ini - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - - dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" - dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - if use opcache; then - elog "Adding opcache to $PHP_EXT_INI_DIR" - echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ - "${D}/${PHP_EXT_INI_DIR}"/opcache.ini - dosym "../ext/opcache.ini" \ - "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" - fi - - # SAPI-specific handling - if [[ "${sapi}" == "fpm" ]] ; then - einfo "Installing FPM config files php-fpm.conf and www.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - doins sapi/fpm/php-fpm.conf - insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d" - doins sapi/fpm/www.conf - fi - - dodoc php.ini-{development,production} -} - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} - -src_prepare() { - default - - # In php-7.x, the FPM pool configuration files have been split off - # of the main config. By default the pool config files go in - # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the - # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later - # we'll install the pool configuration file "www.conf" there. - php_set_ini_dir fpm - sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ - sapi/fpm/php-fpm.conf.in \ - || die 'failed to move the include directory in php-fpm.conf' - - # Emulate buildconf to support cross-compilation - rm -fr aclocal.m4 autom4te.cache config.cache \ - configure main/php_config.h.in || die - eautoconf --force - eautoheader - - # missing skipif; fixed upstream already - rm sapi/cgi/tests/005.phpt || die - - # These three get BORKED on no-ipv6 systems, - # - # https://github.com/php/php-src/pull/11651 - # - rm ext/sockets/tests/mcast_ipv6_recv.phpt \ - ext/sockets/tests/mcast_ipv6_recv_limited.phpt \ - ext/sockets/tests/mcast_ipv6_send.phpt \ - || die - - # fails in a network sandbox, - # - # https://github.com/php/php-src/issues/11662 - # - rm ext/sockets/tests/bug63000.phpt || die - - # expected output needs to be updated, - # - # https://github.com/php/php-src/pull/11648 - # - rm ext/dba/tests/dba_tcadb.phpt || die - - # Two IMAP tests missing SKIPIFs, - # - # https://github.com/php/php-src/pull/11654 - # - rm ext/imap/tests/imap_mutf7_to_utf8.phpt \ - ext/imap/tests/imap_utf8_to_mutf7_basic.phpt \ - || die - - # broken upstream with icu-73.x, - # - # https://github.com/php/php-src/issues/11128 - # - rm ext/intl/tests/calendar_clear_variation1.phpt || die - - # overly sensitive to INI values; fixes sent upstream: - # - # https://github.com/php/php-src/pull/11631 - # - rm ext/session/tests/{bug74514,bug74936,gh7787}.phpt || die - - # This is sensitive to the current "nice" level: - # - # https://github.com/php/php-src/issues/11630 - # - rm ext/standard/tests/general_functions/proc_nice_basic.phpt || die - - # Tests ignoring the "-n" flag we pass to run-tests.php, - # - # https://github.com/php/php-src/pull/11669 - # - rm ext/standard/tests/file/bug60120.phpt \ - ext/standard/tests/general_functions/proc_open_null.phpt \ - ext/standard/tests/general_functions/proc_open_redirect.phpt \ - ext/standard/tests/general_functions/proc_open_sockets1.phpt \ - ext/standard/tests/general_functions/proc_open_sockets2.phpt \ - ext/standard/tests/general_functions/proc_open_sockets3.phpt \ - ext/standard/tests/ini_info/php_ini_loaded_file.phpt \ - sapi/cli/tests/016.phpt \ - sapi/cli/tests/023.phpt \ - sapi/cli/tests/bug65275.phpt \ - sapi/cli/tests/bug74600.phpt \ - sapi/cli/tests/bug78323.phpt \ - || die - - # Same TEST_PHP_EXTRA_ARGS (-n) issue with this one, but it's - # already been fixed upstream. - rm sapi/cli/tests/017.phpt || die - - # Most Oracle tests are borked, - # - # * https://github.com/php/php-src/issues/11804 - # * https://github.com/php/php-src/pull/11820 - # * https://github.com/php/php-src/issues/11819 - # - rm ext/oci8/tests/*.phpt || die - - # https://github.com/php/php-src/issues/12801 - rm ext/pcre/tests/gh11374.phpt || die - - # This is a memory usage test with hard-coded limits. Whenever the - # limits are surpassed... they get increased... but in the meantime, - # the tests fail. This is not really a test that end users should - # be running pre-install, in my opinion. Bug 927461. - rm ext/fileinfo/tests/bug78987.phpt || die -} - -src_configure() { - addpredict /usr/share/snmp/mibs/.index #nowarn - addpredict /var/lib/net-snmp/mib_indexes #nowarn - - # https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527 - filter-lto - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - # Don't allow ./configure to detect and use an existing version - # of PHP; this can lead to all sorts of weird unpredictability - # as in bug 900210. - export ac_cv_prog_PHP="" - - # The php-fpm config file wants localstatedir to be ${EPREFIX}/var - # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. - local our_conf=( - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}/man" - --infodir="${PHP_DESTDIR}/info" - --libdir="${PHP_DESTDIR}/lib" - --with-libdir="$(get_libdir)" - --localstatedir="${EPREFIX}/var" - --without-pear - --without-valgrind - --with-external-libcrypt - $(use_enable threads zts) - ) - - # The slotted man/info pages will be missed by the default list of - # docompress paths. - docompress "${PHP_DESTDIR}/man" "${PHP_DESTDIR}/info" - - our_conf+=( - $(use_with apparmor fpm-apparmor) - $(use_with argon2 password-argon2 "${EPREFIX}/usr") - $(use_with avif) - $(use_enable bcmath) - $(use_with bzip2 bz2 "${EPREFIX}/usr") - $(use_enable calendar) - $(use_enable ctype) - $(use_with curl) - $(use_enable xml dom) - $(use_with enchant) - $(use_enable exif) - $(use_with ffi) - $(use_enable fileinfo) - $(use_enable filter) - $(use_enable ftp) - $(use_with nls gettext "${EPREFIX}/usr") - $(use_with gmp gmp "${EPREFIX}/usr") - $(use_with mhash mhash "${EPREFIX}/usr") - $(use_with iconv iconv \ - $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr")) - $(use_enable intl) - $(use_enable ipv6) - $(use_with kerberos) - $(use_with xml libxml) - $(use_enable unicode mbstring) - $(use_with ssl openssl) - $(use_enable pcntl) - $(use_enable phar) - $(use_enable pdo) - $(use_enable opcache) - $(use_with postgres pgsql "${EPREFIX}/usr") - $(use_enable posix) - $(use_with selinux fpm-selinux) - $(use_with spell pspell "${EPREFIX}/usr") - $(use_enable simplexml) - $(use_enable sharedmem shmop) - $(use_with snmp snmp "${EPREFIX}/usr") - $(use_enable soap) - $(use_enable sockets) - $(use_with sodium) - $(use_with sqlite sqlite3) - $(use_enable sysvipc sysvmsg) - $(use_enable sysvipc sysvsem) - $(use_enable sysvipc sysvshm) - $(use_with tidy tidy "${EPREFIX}/usr") - $(use_enable tokenizer) - $(use_enable xml) - $(use_enable xmlreader) - $(use_enable xmlwriter) - $(use_with xslt xsl) - $(use_with zip) - $(use_with zlib zlib "${EPREFIX}/usr") - $(use_enable debug) - $(use_with valgrind) - ) - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm || use lmdb || use tokyocabinet ; then - our_conf+=( "--enable-dba" ) - fi - - # DBA drivers support - our_conf+=( - $(use_with cdb) - $(use_with berkdb db4 "${EPREFIX}/usr") - $(use_enable flatfile) - $(use_with gdbm gdbm "${EPREFIX}/usr") - $(use_enable inifile) - $(use_with qdbm qdbm "${EPREFIX}/usr") - $(use_with tokyocabinet tcadb "${EPREFIX}/usr") - $(use_with lmdb lmdb "${EPREFIX}/usr") - ) - - # Support for the GD graphics library - our_conf+=( - $(use_with truetype freetype) - $(use_enable cjk gd-jis-conv) - $(use_with gd jpeg) - $(use_with xpm) - $(use_with webp) - ) - # enable gd last, so configure can pick up the previous settings - our_conf+=( $(use_enable gd) ) - - # IMAP support - if use imap ; then - our_conf+=( - $(use_with imap imap "${EPREFIX}/usr") - $(use_with ssl imap-ssl "${EPREFIX}/usr") - ) - fi - - # LDAP support - if use ldap ; then - our_conf+=( - $(use_with ldap ldap "${EPREFIX}/usr") - $(use_with ldap-sasl) - ) - fi - - # MySQL support - our_conf+=( $(use_with mysqli) ) - - local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" - if use mysql || use mysqli ; then - our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) - fi - - # ODBC support - if use odbc && use iodbc ; then - our_conf+=( - --without-unixODBC - --with-iodbc - $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr") - ) - elif use odbc ; then - our_conf+=( - --with-unixODBC="${EPREFIX}/usr" - --without-iodbc - $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr") - ) - else - our_conf+=( - --without-unixODBC - --without-iodbc - --without-pdo-odbc - ) - fi - - # Oracle support - our_conf+=( $(use_with oci8-instant-client oci8) ) - - # PDO support - if use pdo ; then - our_conf+=( - $(use_with mssql pdo-dblib "${EPREFIX}/usr") - $(use_with mysql pdo-mysql "mysqlnd") - $(use_with postgres pdo-pgsql) - $(use_with sqlite pdo-sqlite) - $(use_with firebird pdo-firebird "${EPREFIX}/usr") - $(use_with oci8-instant-client pdo-oci) - ) - fi - - # readline/libedit support - our_conf+=( - $(use_with readline readline "${EPREFIX}/usr") - $(use_with libedit) - ) - - # Session support - if use session ; then - our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) - else - our_conf+=( $(use_enable session) ) - fi - - # Use pic for shared modules such as apache2's mod_php - our_conf+=( --with-pic ) - - # we use the system copy of pcre - # --with-external-pcre affects ext/pcre - our_conf+=( - --with-external-pcre - $(use_with jit pcre-jit) - ) - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Cache the ./configure test results between SAPIs. - our_conf+=( --cache-file="${T}/config.cache" ) - - # Support user-passed configuration parameters - our_conf+=( ${EXTRA_ECONF:-} ) - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - # Create separate build trees for each enabled SAPI. The upstream - # build system doesn't do this, but we have to do it to use a - # different php.ini for each SAPI (see --with-config-file-path and - # --with-config-file-scan-dir below). The path winds up define'd - # in main/build-defs.h which is included in main/php.h which is - # included by basically everything; so, avoiding a rebuild after - # changing it is not an easy job. - local one_sapi - local sapi - mkdir "${WORKDIR}/sapis-build" || die - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - # The BUILD_DIR variable is used to determine where to output - # the files that autotools creates. This was all originally - # based on the autotools-utils eclass. - BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" - cp -a "${S}" "${BUILD_DIR}" || die - - local sapi_conf=( - --with-config-file-path="${PHP_INI_DIR}" - --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" - ) - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm|phpdbg) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( "--enable-${sapi}" ) - if [[ "fpm" == "${sapi}" ]] ; then - sapi_conf+=( - $(use_with acl fpm-acl) - $(use_with systemd fpm-systemd) - ) - fi - else - sapi_conf+=( "--disable-${sapi}" ) - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) - else - sapi_conf+=( --without-apxs2 ) - fi - ;; - esac - done - - # Construct the $myeconfargs array by concatenating $our_conf - # (the common args) and $sapi_conf (the SAPI-specific args). - local myeconfargs=( "${our_conf[@]}" ) - myeconfargs+=( "${sapi_conf[@]}" ) - - pushd "${BUILD_DIR}" > /dev/null || die - einfo "Running econf in ${BUILD_DIR}" - econf "${myeconfargs[@]}" - popd > /dev/null || die - done -} - -src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index #nowarn - addpredict /var/lib/net-snmp/mib_indexes #nowarn - - if use oci8-instant-client && use kerberos && use imap && use phar; then - # A conspiracy takes place when the first three of these flags - # are set together, causing the newly-built "php" to open - # /dev/urandom with mode rw when it starts. That's not actually - # a problem... unless you also have USE=phar, which runs that - # "php" to build some phar thingy in src_compile(). Later in - # src_test(), portage (at least) sets "addpredict /" so the - # problem does not repeat. - addpredict /dev/urandom #nowarn - fi - - local sapi - for sapi in ${SAPIS} ; do - use "${sapi}" && emake -C "${WORKDIR}/sapis-build/${sapi}" - done -} - -src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index #nowarn - - # grab the first SAPI that got built and install common files from there - local first_sapi="", sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" || die - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir "/usr/share/php${PHP_MV}" - - local file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" || die - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp$(get_libname)" \ - "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - local dest="${PHP_DESTDIR#${EPREFIX}}" - into "${dest}" - case "$sapi" in - cli) - source="sapi/cli/php" - # Install the "phar" archive utility. - if use phar ; then - emake INSTALL_ROOT="${D}" install-pharcmd - dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}" - fi - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp$(get_libname)" - ;; - phpdbg) - source="sapi/phpdbg/phpdbg" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" - else - dobin "${source}" - local name="$(basename ${source})" - dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Installing opcache module - if use opcache ; then - into "${PHP_DESTDIR#${EPREFIX}}" - dolib.so "modules/opcache$(get_libname)" - fi - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die - - if use fpm ; then - if use systemd; then - systemd_newunit "${FILESDIR}/php-fpm_at.service" \ - "php-fpm@${SLOT}.service" - else - systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ - "php-fpm@${SLOT}.service" - fi - fi -} - -src_test() { - export TEST_PHP_EXECUTABLE="${WORKDIR}/sapis-build/cli/sapi/cli/php" - - # Sometimes when the sub-php launches a sub-sub-php, it uses these. - # Without an "-n" in all instances, the *live* php.ini can be loaded, - # pulling in *live* zend extensions. And those can be incompatible - # with the thing we just built. - export TEST_PHP_EXTRA_ARGS="-n" - - if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" - fi - - if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then - export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" - fi - - # The sendmail override prevents ext/imap/tests/bug77020.phpt from - # actually trying to send mail, and will be fixed upstream soon: - # - # https://github.com/php/php-src/issues/11629 - # - # The IO capture tests need to be disabled because they fail when - # std{in,out,err} are redirected (as they are within portage). - # - # One -n applies to the top-level "php", while the other applies - # to any sub-php that get invoked by the test runner. - SKIP_IO_CAPTURE_TESTS=1 SKIP_PERF_SENSITIVE=1 REPORT_EXIT_STATUS=1 \ - "${TEST_PHP_EXECUTABLE}" -n \ - "${WORKDIR}/sapis-build/cli/run-tests.php" --offline -n -q \ - -d "session.save_path=${T}" \ - -d "sendmail_path=echo >/dev/null" \ - || die "tests failed" -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - elog - elog "To enable PHP in apache, you will need to add \"-D PHP\" to" - elog "your apache2 command. OpenRC users can append that string to" - elog "APACHE2_OPTS in /etc/conf.d/apache2." - elog - elog "The apache module configuration file 70_mod_php.conf is" - elog "provided (and maintained) by eselect-php." - elog - fi - - # Create the symlinks for php - local m - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} || die - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - # Remove dead symlinks for SAPIs that were just disabled. For - # example, if the user has the cgi SAPI enabled, then he has an - # eselect-php symlink for it. If he later reinstalls PHP with - # USE="-cgi", that symlink will break. This call to eselect is - # supposed to remove that dead link per bug 572436. - eselect php cleanup || die - - if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then - elog "To build extensions for this version of PHP, you will need to" - elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." - elog - fi - - # Warn about the removal of PHP_INI_VERSION if the user has it set. - if [[ -n "${PHP_INI_VERSION}" ]]; then - ewarn 'The PHP_INI_VERSION variable has been phased out. You may' - ewarn 'remove it from your configuration at your convenience. See' - ewarn - ewarn ' https://bugs.gentoo.org/611214' - ewarn - ewarn 'for more information.' - fi - - elog "For details on how version slotting works, please see" - elog "the wiki:" - elog - elog " https://wiki.gentoo.org/wiki/PHP" - elog -} - -pkg_postrm() { - # This serves two purposes. First, if we have just removed the last - # installed version of PHP, then this will remove any dead symlinks - # belonging to eselect-php. Second, if a user upgrades slots from - # (say) 5.6 to 7.0 and depcleans the old slot, then this will update - # his existing symlinks to point to the new 7.0 installation. The - # latter is bug 432962. - # - # Note: the eselect-php package may not be installed at this point, - # so we can't die() if this command fails. - eselect php cleanup -} diff --git a/dev-lang/php/php-8.2.18.ebuild b/dev-lang/php/php-8.2.18.ebuild new file mode 100644 index 000000000000..2e304932b5ed --- /dev/null +++ b/dev-lang/php/php-8.2.18.ebuild @@ -0,0 +1,859 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WANT_AUTOMAKE="none" + +inherit flag-o-matic multilib systemd autotools + +DESCRIPTION="The PHP language runtime engine" +HOMEPAGE="https://www.php.net/" +SRC_URI="https://www.php.net/distributions/${P}.tar.xz" + +LICENSE="PHP-3.01 + BSD + Zend-2.0 + bcmath? ( LGPL-2.1+ ) + fpm? ( BSD-2 ) + gd? ( gd ) + unicode? ( BSD-2 LGPL-2.1 )" + +SLOT="$(ver_cut 1-2)" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +# We can build the following SAPIs in the given order +SAPIS="embed cli cgi fpm apache2 phpdbg" + +# SAPIs and SAPI-specific USE flags (cli SAPI is default on): +IUSE="${IUSE} + ${SAPIS/cli/+cli} + threads" + +IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar + cdb cjk +ctype curl debug + enchant exif ffi +fileinfo +filter firebird + +flatfile ftp gd gdbm gmp +iconv imap inifile + intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb + mhash mssql mysql mysqli nls + oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm + readline selinux +session session-mm sharedmem + +simplexml snmp soap sockets sodium spell sqlite ssl + sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode + valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib" + +# Without USE=readline or libedit, the interactive "php -a" CLI will hang. +# The Oracle instant client provides its own incompatible ldap library. +REQUIRED_USE=" + || ( cli cgi fpm apache2 embed phpdbg ) + avif? ( gd zlib ) + cli? ( ^^ ( readline libedit ) ) + !cli? ( ?? ( readline libedit ) ) + truetype? ( gd zlib ) + webp? ( gd zlib ) + cjk? ( gd zlib ) + exif? ( gd zlib ) + xpm? ( gd zlib ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + xmlreader? ( xml ) + xmlwriter? ( xml ) + xslt? ( xml ) + ldap-sasl? ( ldap ) + oci8-instant-client? ( !ldap ) + qdbm? ( !gdbm ) + session-mm? ( session !threads ) + mysql? ( || ( mysqli pdo ) ) + firebird? ( pdo ) + mssql? ( pdo ) + test? ( cli ) +" + +RESTRICT="!test? ( test )" + +# The supported (that is, autodetected) versions of BDB are listed in +# the ./configure script. Other versions *work*, but we need to stick to +# the ones that can be detected to avoid a repeat of bug #564824. +COMMON_DEPEND=" + >=app-eselect/eselect-php-0.9.7[apache2?,fpm?] + >=dev-libs/libpcre2-10.30[jit?,unicode] + virtual/libcrypt:= + fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) + argon2? ( app-crypt/argon2:= ) + avif? ( media-libs/libavif:= ) + berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) + bzip2? ( app-arch/bzip2:0= ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + curl? ( >=net-misc/curl-7.29.0 ) + enchant? ( app-text/enchant:2 ) + ffi? ( >=dev-libs/libffi-3.0.11:= ) + firebird? ( dev-db/firebird ) + gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) + gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) + gmp? ( dev-libs/gmp:0= ) + iconv? ( virtual/libiconv ) + imap? ( net-libs/c-client[kerberos=,ssl=] ) + intl? ( dev-libs/icu:= ) + kerberos? ( virtual/krb5 ) + ldap? ( >=net-nds/openldap-1.2.11:= ) + ldap-sasl? ( dev-libs/cyrus-sasl ) + libedit? ( dev-libs/libedit ) + lmdb? ( dev-db/lmdb:= ) + mssql? ( dev-db/freetds[mssql] ) + nls? ( sys-devel/gettext ) + oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) + odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) + postgres? ( >=dev-db/postgresql-9.1:* ) + qdbm? ( dev-db/qdbm ) + readline? ( sys-libs/readline:0= ) + session-mm? ( dev-libs/mm ) + snmp? ( >=net-analyzer/net-snmp-5.2 ) + sodium? ( dev-libs/libsodium:=[-minimal(-)] ) + spell? ( >=app-text/aspell-0.50 ) + sqlite? ( >=dev-db/sqlite-3.7.6.3 ) + ssl? ( >=dev-libs/openssl-1.0.2:0= ) + tidy? ( app-text/htmltidy ) + tokyocabinet? ( dev-db/tokyocabinet ) + truetype? ( =media-libs/freetype-2* ) + unicode? ( dev-libs/oniguruma:= ) + valgrind? ( dev-debug/valgrind ) + webp? ( media-libs/libwebp:0= ) + xml? ( >=dev-libs/libxml2-2.9.0 ) + xpm? ( x11-libs/libXpm ) + xslt? ( dev-libs/libxslt ) + zip? ( >=dev-libs/libzip-1.2.0:= ) + zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) +" + +IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]" + +RDEPEND="${COMMON_DEPEND} + virtual/mta + fpm? ( + selinux? ( sec-policy/selinux-phpfpm ) + systemd? ( sys-apps/systemd ) )" + +# Bison isn't actually needed when building from a release tarball +# However, the configure script will warn if it's absent or if you +# have an incompatible version installed. See bug 593278. +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + >=sys-devel/bison-3.0.1" + +BDEPEND="virtual/pkgconfig" + +PHP_MV="$(ver_cut 1)" + +PATCHES=( + "${FILESDIR}/php-iodbc-header-location.patch" + "${FILESDIR}/php-capstone-optional.patch" + "${FILESDIR}/php-8.2.8-openssl-tests.patch" + "${FILESDIR}/fix-musl-llvm.patch" +) + +# ARM/Windows functions (bug 923335) +QA_CONFIG_IMPL_DECL_SKIP=( + __crc32d + _controlfp + _controlfp_s +) + +# Functions from alternate iconv implementations (bug 925268) +QA_CONFIG_IMPL_DECL_SKIP+=( + iconv_ccs_init + cstoccsid +) + +php_install_ini() { + local phpsapi="${1}" + + # work out where we are installing the ini file + php_set_ini_dir "${phpsapi}" + + # Always install the production INI file, bug 611214. + local phpinisrc="php.ini-production-${phpsapi}" + cp php.ini-production "${phpinisrc}" || die + + # default to /tmp for save_path, bug #282768 + sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \ + -i "${phpinisrc}" || die + + # Set the include path to point to where we want to find PEAR packages + sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die + + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" php.ini + + elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + + dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" + dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + if use opcache; then + elog "Adding opcache to $PHP_EXT_INI_DIR" + echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ + "${D}/${PHP_EXT_INI_DIR}"/opcache.ini + dosym "../ext/opcache.ini" \ + "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" + fi + + # SAPI-specific handling + if [[ "${sapi}" == "fpm" ]] ; then + einfo "Installing FPM config files php-fpm.conf and www.conf" + insinto "${PHP_INI_DIR#${EPREFIX}}" + doins sapi/fpm/php-fpm.conf + insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d" + doins sapi/fpm/www.conf + fi + + dodoc php.ini-{development,production} +} + +php_set_ini_dir() { + PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" + PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" + PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" +} + +src_prepare() { + default + + # In php-7.x, the FPM pool configuration files have been split off + # of the main config. By default the pool config files go in + # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the + # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later + # we'll install the pool configuration file "www.conf" there. + php_set_ini_dir fpm + sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ + sapi/fpm/php-fpm.conf.in \ + || die 'failed to move the include directory in php-fpm.conf' + + # Emulate buildconf to support cross-compilation + rm -fr aclocal.m4 autom4te.cache config.cache \ + configure main/php_config.h.in || die + eautoconf --force + eautoheader + + # missing skipif; fixed upstream already + rm sapi/cgi/tests/005.phpt || die + + # These three get BORKED on no-ipv6 systems, + # + # https://github.com/php/php-src/pull/11651 + # + rm ext/sockets/tests/mcast_ipv6_recv.phpt \ + ext/sockets/tests/mcast_ipv6_recv_limited.phpt \ + ext/sockets/tests/mcast_ipv6_send.phpt \ + || die + + # fails in a network sandbox, + # + # https://github.com/php/php-src/issues/11662 + # + rm ext/sockets/tests/bug63000.phpt || die + + # expected output needs to be updated, + # + # https://github.com/php/php-src/pull/11648 + # + rm ext/dba/tests/dba_tcadb.phpt || die + + # Two IMAP tests missing SKIPIFs, + # + # https://github.com/php/php-src/pull/11654 + # + rm ext/imap/tests/imap_mutf7_to_utf8.phpt \ + ext/imap/tests/imap_utf8_to_mutf7_basic.phpt \ + || die + + # broken upstream with icu-73.x, + # + # https://github.com/php/php-src/issues/11128 + # + rm ext/intl/tests/calendar_clear_variation1.phpt || die + + # overly sensitive to INI values; fixes sent upstream: + # + # https://github.com/php/php-src/pull/11631 + # + rm ext/session/tests/{bug74514,bug74936,gh7787}.phpt || die + + # This is sensitive to the current "nice" level: + # + # https://github.com/php/php-src/issues/11630 + # + rm ext/standard/tests/general_functions/proc_nice_basic.phpt || die + + # Tests ignoring the "-n" flag we pass to run-tests.php, + # + # https://github.com/php/php-src/pull/11669 + # + rm ext/standard/tests/file/bug60120.phpt \ + ext/standard/tests/general_functions/proc_open_null.phpt \ + ext/standard/tests/general_functions/proc_open_redirect.phpt \ + ext/standard/tests/general_functions/proc_open_sockets1.phpt \ + ext/standard/tests/general_functions/proc_open_sockets2.phpt \ + ext/standard/tests/general_functions/proc_open_sockets3.phpt \ + ext/standard/tests/ini_info/php_ini_loaded_file.phpt \ + sapi/cli/tests/016.phpt \ + sapi/cli/tests/023.phpt \ + sapi/cli/tests/bug65275.phpt \ + sapi/cli/tests/bug74600.phpt \ + sapi/cli/tests/bug78323.phpt \ + || die + + # Same TEST_PHP_EXTRA_ARGS (-n) issue with this one, but it's + # already been fixed upstream. + rm sapi/cli/tests/017.phpt || die + + # Most Oracle tests are borked, + # + # * https://github.com/php/php-src/issues/11804 + # * https://github.com/php/php-src/pull/11820 + # * https://github.com/php/php-src/issues/11819 + # + rm ext/oci8/tests/*.phpt || die + + # https://github.com/php/php-src/issues/12801 + rm ext/pcre/tests/gh11374.phpt || die + + # This is a memory usage test with hard-coded limits. Whenever the + # limits are surpassed... they get increased... but in the meantime, + # the tests fail. This is not really a test that end users should + # be running pre-install, in my opinion. Bug 927461. + rm ext/fileinfo/tests/bug78987.phpt || die +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + # https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527 + filter-lto + + PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" + + # Don't allow ./configure to detect and use an existing version + # of PHP; this can lead to all sorts of weird unpredictability + # as in bug 900210. + export ac_cv_prog_PHP="" + + # The php-fpm config file wants localstatedir to be ${EPREFIX}/var + # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. + local our_conf=( + --prefix="${PHP_DESTDIR}" + --mandir="${PHP_DESTDIR}/man" + --infodir="${PHP_DESTDIR}/info" + --libdir="${PHP_DESTDIR}/lib" + --with-libdir="$(get_libdir)" + --localstatedir="${EPREFIX}/var" + --without-pear + --without-valgrind + --with-external-libcrypt + $(use_enable threads zts) + ) + + # The slotted man/info pages will be missed by the default list of + # docompress paths. + docompress "${PHP_DESTDIR}/man" "${PHP_DESTDIR}/info" + + our_conf+=( + $(use_with apparmor fpm-apparmor) + $(use_with argon2 password-argon2 "${EPREFIX}/usr") + $(use_with avif) + $(use_enable bcmath) + $(use_with bzip2 bz2 "${EPREFIX}/usr") + $(use_enable calendar) + $(use_enable ctype) + $(use_with curl) + $(use_enable xml dom) + $(use_with enchant) + $(use_enable exif) + $(use_with ffi) + $(use_enable fileinfo) + $(use_enable filter) + $(use_enable ftp) + $(use_with nls gettext "${EPREFIX}/usr") + $(use_with gmp gmp "${EPREFIX}/usr") + $(use_with mhash mhash "${EPREFIX}/usr") + $(use_with iconv iconv \ + $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr")) + $(use_enable intl) + $(use_enable ipv6) + $(use_with kerberos) + $(use_with xml libxml) + $(use_enable unicode mbstring) + $(use_with ssl openssl) + $(use_enable pcntl) + $(use_enable phar) + $(use_enable pdo) + $(use_enable opcache) + $(use_with postgres pgsql "${EPREFIX}/usr") + $(use_enable posix) + $(use_with selinux fpm-selinux) + $(use_with spell pspell "${EPREFIX}/usr") + $(use_enable simplexml) + $(use_enable sharedmem shmop) + $(use_with snmp snmp "${EPREFIX}/usr") + $(use_enable soap) + $(use_enable sockets) + $(use_with sodium) + $(use_with sqlite sqlite3) + $(use_enable sysvipc sysvmsg) + $(use_enable sysvipc sysvsem) + $(use_enable sysvipc sysvshm) + $(use_with tidy tidy "${EPREFIX}/usr") + $(use_enable tokenizer) + $(use_enable xml) + $(use_enable xmlreader) + $(use_enable xmlwriter) + $(use_with xslt xsl) + $(use_with zip) + $(use_with zlib zlib "${EPREFIX}/usr") + $(use_enable debug) + $(use_with valgrind) + ) + + # DBA support + if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ + || use qdbm || use lmdb || use tokyocabinet ; then + our_conf+=( "--enable-dba" ) + fi + + # DBA drivers support + our_conf+=( + $(use_with cdb) + $(use_with berkdb db4 "${EPREFIX}/usr") + $(use_enable flatfile) + $(use_with gdbm gdbm "${EPREFIX}/usr") + $(use_enable inifile) + $(use_with qdbm qdbm "${EPREFIX}/usr") + $(use_with tokyocabinet tcadb "${EPREFIX}/usr") + $(use_with lmdb lmdb "${EPREFIX}/usr") + ) + + # Support for the GD graphics library + our_conf+=( + $(use_with truetype freetype) + $(use_enable cjk gd-jis-conv) + $(use_with gd jpeg) + $(use_with xpm) + $(use_with webp) + ) + # enable gd last, so configure can pick up the previous settings + our_conf+=( $(use_enable gd) ) + + # IMAP support + if use imap ; then + our_conf+=( + $(use_with imap imap "${EPREFIX}/usr") + $(use_with ssl imap-ssl "${EPREFIX}/usr") + ) + fi + + # LDAP support + if use ldap ; then + our_conf+=( + $(use_with ldap ldap "${EPREFIX}/usr") + $(use_with ldap-sasl) + ) + fi + + # MySQL support + our_conf+=( $(use_with mysqli) ) + + local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" + if use mysql || use mysqli ; then + our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) + fi + + # ODBC support + if use odbc && use iodbc ; then + our_conf+=( + --without-unixODBC + --with-iodbc + $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr") + ) + elif use odbc ; then + our_conf+=( + --with-unixODBC="${EPREFIX}/usr" + --without-iodbc + $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr") + ) + else + our_conf+=( + --without-unixODBC + --without-iodbc + --without-pdo-odbc + ) + fi + + # Oracle support + our_conf+=( $(use_with oci8-instant-client oci8) ) + + # PDO support + if use pdo ; then + our_conf+=( + $(use_with mssql pdo-dblib "${EPREFIX}/usr") + $(use_with mysql pdo-mysql "mysqlnd") + $(use_with postgres pdo-pgsql) + $(use_with sqlite pdo-sqlite) + $(use_with firebird pdo-firebird "${EPREFIX}/usr") + $(use_with oci8-instant-client pdo-oci) + ) + fi + + # readline/libedit support + our_conf+=( + $(use_with readline readline "${EPREFIX}/usr") + $(use_with libedit) + ) + + # Session support + if use session ; then + our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) + else + our_conf+=( $(use_enable session) ) + fi + + # Use pic for shared modules such as apache2's mod_php + our_conf+=( --with-pic ) + + # we use the system copy of pcre + # --with-external-pcre affects ext/pcre + our_conf+=( + --with-external-pcre + $(use_with jit pcre-jit) + ) + + # Catch CFLAGS problems + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" + + # Cache the ./configure test results between SAPIs. + our_conf+=( --cache-file="${T}/config.cache" ) + + # Support user-passed configuration parameters + our_conf+=( ${EXTRA_ECONF:-} ) + + # Support the Apache2 extras, they must be set globally for all + # SAPIs to work correctly, especially for external PHP extensions + + # Create separate build trees for each enabled SAPI. The upstream + # build system doesn't do this, but we have to do it to use a + # different php.ini for each SAPI (see --with-config-file-path and + # --with-config-file-scan-dir below). The path winds up define'd + # in main/build-defs.h which is included in main/php.h which is + # included by basically everything; so, avoiding a rebuild after + # changing it is not an easy job. + local one_sapi + local sapi + mkdir "${WORKDIR}/sapis-build" || die + for one_sapi in $SAPIS ; do + use "${one_sapi}" || continue + php_set_ini_dir "${one_sapi}" + + # The BUILD_DIR variable is used to determine where to output + # the files that autotools creates. This was all originally + # based on the autotools-utils eclass. + BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" + cp -a "${S}" "${BUILD_DIR}" || die + + local sapi_conf=( + --with-config-file-path="${PHP_INI_DIR}" + --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" + ) + + for sapi in $SAPIS ; do + case "$sapi" in + cli|cgi|embed|fpm|phpdbg) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf+=( "--enable-${sapi}" ) + if [[ "fpm" == "${sapi}" ]] ; then + sapi_conf+=( + $(use_with acl fpm-acl) + $(use_with systemd fpm-systemd) + ) + fi + else + sapi_conf+=( "--disable-${sapi}" ) + fi + ;; + + apache2) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) + else + sapi_conf+=( --without-apxs2 ) + fi + ;; + esac + done + + # Construct the $myeconfargs array by concatenating $our_conf + # (the common args) and $sapi_conf (the SAPI-specific args). + local myeconfargs=( "${our_conf[@]}" ) + myeconfargs+=( "${sapi_conf[@]}" ) + + pushd "${BUILD_DIR}" > /dev/null || die + einfo "Running econf in ${BUILD_DIR}" + econf "${myeconfargs[@]}" + popd > /dev/null || die + done +} + +src_compile() { + # snmp seems to run during src_compile, too (bug #324739) + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + if use oci8-instant-client && use kerberos && use imap && use phar; then + # A conspiracy takes place when the first three of these flags + # are set together, causing the newly-built "php" to open + # /dev/urandom with mode rw when it starts. That's not actually + # a problem... unless you also have USE=phar, which runs that + # "php" to build some phar thingy in src_compile(). Later in + # src_test(), portage (at least) sets "addpredict /" so the + # problem does not repeat. + addpredict /dev/urandom #nowarn + fi + + local sapi + for sapi in ${SAPIS} ; do + use "${sapi}" && emake -C "${WORKDIR}/sapis-build/${sapi}" + done +} + +src_install() { + # see bug #324739 for what happens when we don't have that + addpredict /usr/share/snmp/mibs/.index #nowarn + + # grab the first SAPI that got built and install common files from there + local first_sapi="", sapi="" + for sapi in $SAPIS ; do + if use $sapi ; then + first_sapi=$sapi + break + fi + done + + # Makefile forgets to create this before trying to write to it... + dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" || die + emake INSTALL_ROOT="${D}" \ + install-build install-headers install-programs + + local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # Create the directory where we'll put version-specific php scripts + keepdir "/usr/share/php${PHP_MV}" + + local file="" + local sapi_list="" + + for sapi in ${SAPIS}; do + if use "${sapi}" ; then + einfo "Installing SAPI: ${sapi}" + cd "${WORKDIR}/sapis-build/${sapi}" || die + + if [[ "${sapi}" == "apache2" ]] ; then + # We're specifically not using emake install-sapi as libtool + # may cause unnecessary relink failures (see bug #351266) + insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" + newins ".libs/libphp$(get_libname)" \ + "libphp${PHP_MV}$(get_libname)" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + # needed each time, php_install_ini would reset it + local dest="${PHP_DESTDIR#${EPREFIX}}" + into "${dest}" + case "$sapi" in + cli) + source="sapi/cli/php" + # Install the "phar" archive utility. + if use phar ; then + emake INSTALL_ROOT="${D}" install-pharcmd + dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}" + fi + ;; + cgi) + source="sapi/cgi/php-cgi" + ;; + fpm) + source="sapi/fpm/php-fpm" + ;; + embed) + source="libs/libphp$(get_libname)" + ;; + phpdbg) + source="sapi/phpdbg/phpdbg" + ;; + *) + die "unhandled sapi in src_install" + ;; + esac + + if [[ "${source}" == *"$(get_libname)" ]]; then + dolib.so "${source}" + else + dobin "${source}" + local name="$(basename ${source})" + dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}" + fi + fi + + php_install_ini "${sapi}" + + # construct correct SAPI string for php-config + # thanks to ferringb for the bash voodoo + if [[ "${sapi}" == "apache2" ]]; then + sapi_list="${sapi_list:+${sapi_list} }apache2handler" + else + sapi_list="${sapi_list:+${sapi_list} }${sapi}" + fi + fi + done + + # Installing opcache module + if use opcache ; then + into "${PHP_DESTDIR#${EPREFIX}}" + dolib.so "modules/opcache$(get_libname)" + fi + + # Install env.d files + newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die + sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ + "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die + + if use fpm ; then + if use systemd; then + systemd_newunit "${FILESDIR}/php-fpm_at.service" \ + "php-fpm@${SLOT}.service" + else + systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ + "php-fpm@${SLOT}.service" + fi + fi +} + +src_test() { + export TEST_PHP_EXECUTABLE="${WORKDIR}/sapis-build/cli/sapi/cli/php" + + # Sometimes when the sub-php launches a sub-sub-php, it uses these. + # Without an "-n" in all instances, the *live* php.ini can be loaded, + # pulling in *live* zend extensions. And those can be incompatible + # with the thing we just built. + export TEST_PHP_EXTRA_ARGS="-n" + + if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" + fi + + if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then + export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" + fi + + # The sendmail override prevents ext/imap/tests/bug77020.phpt from + # actually trying to send mail, and will be fixed upstream soon: + # + # https://github.com/php/php-src/issues/11629 + # + # The IO capture tests need to be disabled because they fail when + # std{in,out,err} are redirected (as they are within portage). + # + # One -n applies to the top-level "php", while the other applies + # to any sub-php that get invoked by the test runner. + SKIP_IO_CAPTURE_TESTS=1 SKIP_PERF_SENSITIVE=1 REPORT_EXIT_STATUS=1 \ + "${TEST_PHP_EXECUTABLE}" -n \ + "${WORKDIR}/sapis-build/cli/run-tests.php" --offline -n -q \ + -d "session.save_path=${T}" \ + -d "sendmail_path=echo >/dev/null" \ + || die "tests failed" +} + +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + elog + elog "To enable PHP in apache, you will need to add \"-D PHP\" to" + elog "your apache2 command. OpenRC users can append that string to" + elog "APACHE2_OPTS in /etc/conf.d/apache2." + elog + elog "The apache module configuration file 70_mod_php.conf is" + elog "provided (and maintained) by eselect-php." + elog + fi + + # Create the symlinks for php + local m + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} || die + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + # Remove dead symlinks for SAPIs that were just disabled. For + # example, if the user has the cgi SAPI enabled, then he has an + # eselect-php symlink for it. If he later reinstalls PHP with + # USE="-cgi", that symlink will break. This call to eselect is + # supposed to remove that dead link per bug 572436. + eselect php cleanup || die + + if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then + elog "To build extensions for this version of PHP, you will need to" + elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." + elog + fi + + # Warn about the removal of PHP_INI_VERSION if the user has it set. + if [[ -n "${PHP_INI_VERSION}" ]]; then + ewarn 'The PHP_INI_VERSION variable has been phased out. You may' + ewarn 'remove it from your configuration at your convenience. See' + ewarn + ewarn ' https://bugs.gentoo.org/611214' + ewarn + ewarn 'for more information.' + fi + + elog "For details on how version slotting works, please see" + elog "the wiki:" + elog + elog " https://wiki.gentoo.org/wiki/PHP" + elog +} + +pkg_postrm() { + # This serves two purposes. First, if we have just removed the last + # installed version of PHP, then this will remove any dead symlinks + # belonging to eselect-php. Second, if a user upgrades slots from + # (say) 5.6 to 7.0 and depcleans the old slot, then this will update + # his existing symlinks to point to the new 7.0 installation. The + # latter is bug 432962. + # + # Note: the eselect-php package may not be installed at this point, + # so we can't die() if this command fails. + eselect php cleanup +} diff --git a/dev-lang/php/php-8.3.4.ebuild b/dev-lang/php/php-8.3.6.ebuild similarity index 100% rename from dev-lang/php/php-8.3.4.ebuild rename to dev-lang/php/php-8.3.6.ebuild diff --git a/dev-lang/python-exec/python-exec-2.4.10.ebuild b/dev-lang/python-exec/python-exec-2.4.10.ebuild index 05556b1b0d4e..85085af14303 100644 --- a/dev-lang/python-exec/python-exec-2.4.10.ebuild +++ b/dev-lang/python-exec/python-exec-2.4.10.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=7 +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} pypy3 ) -PYTHON_COMPAT=( python3_{9..11} pypy3 ) inherit python-any-r1 DESCRIPTION="Python script wrapper" @@ -19,11 +20,13 @@ RESTRICT="!test? ( test )" RDEPEND=" dev-lang/python-exec-conf - !<=dev-lang/python-2.7.18-r3:2.7" + !<=dev-lang/python-2.7.18-r3:2.7 +" BDEPEND=" test? ( $(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]') - )" + ) +" python_check_deps() { python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" @@ -50,6 +53,11 @@ src_configure() { econf "${myconf[@]}" } +src_test() { + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + default +} + src_install() { default diff --git a/dev-lang/python/python-3.10.14_p1.ebuild b/dev-lang/python/python-3.10.14_p1.ebuild index 6900b7539b01..1c8c99fe93ca 100644 --- a/dev-lang/python/python-3.10.14_p1.ebuild +++ b/dev-lang/python/python-3.10.14_p1.ebuild @@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE=" bluetooth build debug +ensurepip examples gdbm libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind diff --git a/dev-lang/python/python-3.11.9.ebuild b/dev-lang/python/python-3.11.9.ebuild index b114eda721c5..99f9650f71a7 100644 --- a/dev-lang/python/python-3.11.9.ebuild +++ b/dev-lang/python/python-3.11.9.ebuild @@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86" IUSE=" bluetooth build debug +ensurepip examples gdbm libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind diff --git a/dev-lang/python/python-3.12.3.ebuild b/dev-lang/python/python-3.12.3.ebuild index 3e3945dce934..6133d8e6f041 100644 --- a/dev-lang/python/python-3.12.3.ebuild +++ b/dev-lang/python/python-3.12.3.ebuild @@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE=" bluetooth build debug +ensurepip examples gdbm libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind diff --git a/dev-lang/python/python-3.8.19_p1.ebuild b/dev-lang/python/python-3.8.19_p1.ebuild index f394c5fb9aa2..40996eefef2c 100644 --- a/dev-lang/python/python-3.8.19_p1.ebuild +++ b/dev-lang/python/python-3.8.19_p1.ebuild @@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE=" bluetooth build debug +ensurepip examples gdbm +ncurses pgo +readline +sqlite +ssl test tk valgrind diff --git a/dev-lang/python/python-3.9.19_p2.ebuild b/dev-lang/python/python-3.9.19_p2.ebuild index fd4b8ed19c88..fcb40b0b159b 100644 --- a/dev-lang/python/python-3.9.19_p2.ebuild +++ b/dev-lang/python/python-3.9.19_p2.ebuild @@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE=" bluetooth build debug +ensurepip examples gdbm +ncurses pgo +readline +sqlite +ssl test tk valgrind diff --git a/dev-lang/qore/Manifest b/dev-lang/qore/Manifest index f0801e744773..57a7cef0bdf8 100644 --- a/dev-lang/qore/Manifest +++ b/dev-lang/qore/Manifest @@ -1,2 +1 @@ -DIST qore-1.19.1.tar.gz 3933768 BLAKE2B 8e3002a55f1cf15f22ff604b1ceaf71995727510e365ae6ab03b71a91ddc1a82c5d6d89514b989a3509a5b39228fcf8fe11b6d88df8af784cace9b56b9d22482 SHA512 bf2203f8fe81cd4a604e06859380664f5cf635f5496e1ce6b6d5760d4cba82e510c78acef7ced4fdacd6df722f6eb305307106f12df3201003858a5a55256d9e DIST qore-1.19.2.tar.gz 3937953 BLAKE2B 136fd456dc6f262c3c1237448945c7d79b6c48a31c63e5213c7f03a695cda40d91605fc5f8f7887354ae47741342233228107ee327c192b449665fdec0664e62 SHA512 b79ecd1ed9ee934039e143711941a8317e02220403c934865632b37f030797520f0db434ef517e2d813f35a37d966f7c5a745202969fcee32494c4972f503fb1 diff --git a/dev-lang/qore/qore-1.19.1.ebuild b/dev-lang/qore/qore-1.19.1.ebuild deleted file mode 100644 index 38b2af9a08c7..000000000000 --- a/dev-lang/qore/qore-1.19.1.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 - -DESCRIPTION="Qore, the embeddable multithreaded scripting language" -HOMEPAGE="http://qore.org/ - https://github.com/qorelanguage/qore/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/qorelanguage/${PN}.git" -else - SRC_URI="https://github.com/qorelanguage/${PN}/archive/release-${PV}.tar.gz - -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-release-${PV}" - - KEYWORDS="amd64 ~x86" -fi - -LICENSE="GPL-2+ LGPL-2.1+ MIT" -SLOT="0" -IUSE="debug" - -RDEPEND=" - app-arch/bzip2:= - dev-libs/libpcre:= - dev-libs/mpfr:= - dev-libs/openssl:= - sys-libs/zlib:= -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - sys-devel/bison - sys-devel/flex -" - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - # Needs "bison" and "flex" exactly. - unset LEX - unset YACC - - local -a myconf=( - --disable-optimization - --disable-profile - --disable-static-bz2 - --disable-static-common - --disable-static-openssl - --disable-static-pcre - --disable-static-zlib - $(use_enable debug) - ) - econf "${myconf[@]}" -} - -src_test() { - PATH="${S}:${PATH}" emake check -} - -src_install() { - default - - find "${ED}" -type f -name "*.la" -delete || - die "failed to remove libtool files without corresponding static libraries" -} diff --git a/dev-lang/rust-bin/rust-bin-1.75.0.ebuild b/dev-lang/rust-bin/rust-bin-1.75.0.ebuild index 75b074517e90..30174fe2be2c 100644 --- a/dev-lang/rust-bin/rust-bin-1.75.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.75.0.ebuild @@ -30,7 +30,7 @@ SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar. LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="stable" -KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" DEPEND="" diff --git a/dev-lang/rust/rust-1.75.0-r1.ebuild b/dev-lang/rust/rust-1.75.0-r1.ebuild index b3b54a2b22d7..0edae23c64ed 100644 --- a/dev-lang/rust/rust-1.75.0-r1.ebuild +++ b/dev-lang/rust/rust-1.75.0-r1.ebuild @@ -19,7 +19,7 @@ else SLOT="stable/${ABI_VER}" MY_P="rustc-${PV}" SRC="${MY_P}-src.tar.xz" - KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86" fi RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" diff --git a/dev-lang/typescript/Manifest b/dev-lang/typescript/Manifest index 0355629c64b5..c2fbcf27f1df 100644 --- a/dev-lang/typescript/Manifest +++ b/dev-lang/typescript/Manifest @@ -2,3 +2,4 @@ DIST typescript-5.3.3.tgz 5761919 BLAKE2B 629d2d97a9d57f63cd693a6d77cc385058778c DIST typescript-5.4.2.tgz 5824544 BLAKE2B a22ecc8a17be22da10263746537d5ce0a0af359866773d6d4d081332a82436c734628d0d89134db63f46fae57f62f6e674f420cea2fff902c1be1a25307b03d8 SHA512 fb6fe0d0576cd444653fa26c6a44100d78d975930cfabaa96a61592442a1e24c13227de20e480ab5bcb409e35de404cd678472d5ac75e53331d16d95fa68a2cd DIST typescript-5.4.3.tgz 5824407 BLAKE2B c985361a7248f87437bd3df1ce7a66cb6c409b91718fd874f4a51cbff91d7b1bcf91034d1bcfbd3e469e168c4e2571892b28ac74edcdd04fc12c3391925dfb49 SHA512 2ab3dddcf29a08bafbf0c6a5822c099c0db9366f070267703779985186601bfc22cc8a3d11a8a7355408f7fc836afb5515137687793cb9fdc62c7ba10cc8041e DIST typescript-5.4.4.tgz 5825725 BLAKE2B 98ebd2f2c3472b7944009f672d647d34540b3cb331fb02d41069df572dc10a0f19c08aee7a12c0536e6d3895502e4a8c11b8ff0c1dcb2d58e0398795f2ce50fe SHA512 74613656ff1ca55bf0dbcbfc1c23eac9bd3c1336c1511c43a6e849bd3aeeb128547c69e11c169f0ec2dd4b5121871c8be8125013ed9c4f77433c0bfe310ea82f +DIST typescript-5.4.5.tgz 5825770 BLAKE2B aea24c0924b2a0b0d01face2ce6be4e7fac85c2205cb0ecde492c5301f83d55fd8cd501326bd47f90cd78abf48c7aaf0381b13fc8242f3d2f9235e6051860b2b SHA512 bdc23852946083cd68211505c11d164881cab75d6727b48056560d22ef90a6a7b25cffa0a50272fd9e3e174686c5213832ac23c97bd6fd3ce090b031d80187c1 diff --git a/dev-lang/typescript/typescript-5.4.2.ebuild b/dev-lang/typescript/typescript-5.4.2.ebuild index 2be080b52222..761177a3441e 100644 --- a/dev-lang/typescript/typescript-5.4.2.ebuild +++ b/dev-lang/typescript/typescript-5.4.2.ebuild @@ -11,7 +11,7 @@ S="${WORKDIR}"/package LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64" +KEYWORDS="amd64 ~arm64 ~ppc64" RDEPEND="net-libs/nodejs" BDEPEND=">=net-libs/nodejs-16[npm]" diff --git a/dev-lang/typescript/typescript-5.4.5.ebuild b/dev-lang/typescript/typescript-5.4.5.ebuild new file mode 100644 index 000000000000..2be080b52222 --- /dev/null +++ b/dev-lang/typescript/typescript-5.4.5.ebuild @@ -0,0 +1,39 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Superset of JavaScript with optional static typing, classes and interfaces" +HOMEPAGE="https://www.typescriptlang.org/ + https://github.com/microsoft/TypeScript/" +SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz" +S="${WORKDIR}"/package + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64" + +RDEPEND="net-libs/nodejs" +BDEPEND=">=net-libs/nodejs-16[npm]" + +src_compile() { + # Skip, nothing to compile here. + : +} + +src_install() { + local myopts=( + --audit false + --color false + --foreground-scripts + --global + --offline + --omit dev + --prefix "${ED}"/usr + --progress false + --verbose + ) + npm ${myopts[@]} install "${DISTDIR}"/${P}.tgz || die "npm install failed" + + dodoc *.md *.txt +} diff --git a/dev-lang/vala/vala-0.56.16.ebuild b/dev-lang/vala/vala-0.56.16.ebuild index b9c3c1b71920..3968a764f030 100644 --- a/dev-lang/vala/vala-0.56.16.ebuild +++ b/dev-lang/vala/vala-0.56.16.ebuild @@ -20,10 +20,10 @@ RDEPEND=" valadoc? ( >=media-gfx/graphviz-2.16 ) " DEPEND="${RDEPEND} + dev-libs/gobject-introspection test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 - dev-libs/gobject-introspection ) " BDEPEND=" diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 33f750485f4a..174924e33c9a 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/apache-arrow/apache-arrow-15.0.2.ebuild b/dev-libs/apache-arrow/apache-arrow-15.0.2.ebuild index 71329cce3a90..6b2586c3e32b 100644 --- a/dev-libs/apache-arrow/apache-arrow-15.0.2.ebuild +++ b/dev-libs/apache-arrow/apache-arrow-15.0.2.ebuild @@ -28,7 +28,7 @@ S="${WORKDIR}/${P}/cpp" LICENSE="Apache-2.0" SLOT="0/$(ver_cut 1)" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~s390 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~s390 ~x86" IUSE=" +brotli bzip2 compute dataset +json lz4 +parquet re2 +snappy ssl test zlib zstd diff --git a/dev-libs/blake3/Manifest b/dev-libs/blake3/Manifest index cab775f96d36..14f82ce4b719 100644 --- a/dev-libs/blake3/Manifest +++ b/dev-libs/blake3/Manifest @@ -1,2 +1,2 @@ -DIST blake3-1.4.1.tar.gz 224891 BLAKE2B c5d20f40ee2c4c35dfa89de8318e246baef2feab23d71e6c73da201c726ea51b42bec2a5769660a18298057591f479a62b29150f91f07b37eed3438f1a78bec1 SHA512 d21025764fb9ae020561ce2301156a69a77c89a4c5e402a27095e5014159d1a8fee340ff1b1db00b5b22f7a9a4d38273132aab13ca5bd639944492f1b31c9ec1 DIST blake3-1.5.0.tar.gz 228053 BLAKE2B 04405b0bea5e0a5a774c84e712f36c61fd695c4cbe203a327741db7138af38fc4deda7c75a149f1850a1ca01a519897fb8e84c2cbe38f9cc084357c5ed61a1ed SHA512 eb782d48240cf2fa8cc3cddd699dce3a362eb480b3ca58a97d54cd3595a0c969e51fe14374b91136036e8e29c8f745efbd5a4d1aaed2c17f23cb89fb756645d0 +DIST blake3-1.5.1.tar.gz 242161 BLAKE2B 12712bcc6413f90bd9d79ee87d73b45ee611032ccfa3f9e73b2c41b080c2a9451db028c9ff32efa546bef19b85e4aa9fc5ecd9fc6b76c34fd347cbc5fe337649 SHA512 a2ac662b0e45d1f4c4ee01a5e556a47c49ab5407a6057034033ce6fd0fc6b88f66dd428d80f5e7c4a8413356cb4b5ab655924d96138213499893e0204d7c8d24 diff --git a/dev-libs/blake3/blake3-1.4.1.ebuild b/dev-libs/blake3/blake3-1.4.1.ebuild deleted file mode 100644 index 2bc612e7279e..000000000000 --- a/dev-libs/blake3/blake3-1.4.1.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="a fast cryptographic hash function" -HOMEPAGE="https://github.com/BLAKE3-team/BLAKE3" -SRC_URI="https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/BLAKE3-${PV}/c" - -LICENSE="|| ( CC0-1.0 Apache-2.0 )" -SLOT="0/0" -KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/dev-libs/blake3/blake3-1.5.1.ebuild b/dev-libs/blake3/blake3-1.5.1.ebuild new file mode 100644 index 000000000000..7440aae92bc1 --- /dev/null +++ b/dev-libs/blake3/blake3-1.5.1.ebuild @@ -0,0 +1,15 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="a fast cryptographic hash function" +HOMEPAGE="https://github.com/BLAKE3-team/BLAKE3" +SRC_URI="https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/BLAKE3-${PV}/c" + +LICENSE="|| ( CC0-1.0 Apache-2.0 )" +SLOT="0/0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86" diff --git a/dev-libs/c-blosc2/Manifest b/dev-libs/c-blosc2/Manifest index 48e5886c7c13..48335995ab69 100644 --- a/dev-libs/c-blosc2/Manifest +++ b/dev-libs/c-blosc2/Manifest @@ -2,4 +2,4 @@ DIST c-blosc2-2.10.5.gh.tar.gz 3144174 BLAKE2B a680def405f2383636185ab1b71a42e04 DIST c-blosc2-2.13.2.gh.tar.gz 3152011 BLAKE2B 1bf9826e6eb1babacb0fe6f7f90c5ca6617cf1cf4df269af95c94e175d0a1cc2015905b9cf6a48107f0b10431feb646ec5de095e00dc29f3bab8d53564e7d4fe SHA512 441df73dca3fe210b0df68bfc3da037a05393f80044f5e2c816000a244ade4cf8e223b2fce2127c034c27a35f2742b05fe06c08861e93c02bc7598d5a4b8a917 DIST c-blosc2-2.14.0.gh.tar.gz 3155739 BLAKE2B 2607ea3e842fce469f04d31b2d92503f270409e952968e7217ca87ebccd64b25aa38282743f7fdb3ba199f71acc246f7ef9fa0b24e33417e6bdf69a68aba62a6 SHA512 74f0df844c722248a1743fa6ce4b20ae526831f29cc66baf6f487e743c9fc65713e089ebab63ebcf43ac7b1201e82f9c7049dfb68cff17116de93f36d9482557 DIST c-blosc2-2.14.1.gh.tar.gz 3155751 BLAKE2B 6967914214603af724ab523e91cef2c720018c75002402a5d3ac1bf064af27069ee12db80f7ac37ad5136a30a280b37b829fda7c03b87e2a027599d235ed6021 SHA512 952e2331be4747005e82cabdda310f96031dcfe54f9fe92f68ff2efb42aa8dfb3aa9d6c3ab9ce9f94ea52c34322047447db98d530a58eddc9fca6f62872fd272 -DIST c-blosc2-2.14.3.gh.tar.gz 3155812 BLAKE2B e34813d3903792d48ccd4ff9f52dd353fa2529427e42001c70a93851b3d19eb2ec0d7aadf6694c49db799789d1a8fc8a9474e6db0a91119aeeff69253d058e04 SHA512 dcc019c32785f1c46c185e8364104dcf1954ca865b620d7d35e21c8772d82b95dd7e956281a0ba637a15263c7cb9a5616fbb83a59409d6b1a1ba144152deb20a +DIST c-blosc2-2.14.4.gh.tar.gz 3155712 BLAKE2B 1af67562150b7b0b87fa076114bab0cccfbd12417c13dfae4fbd40e15531ed54f3a315588ac81b15e137f0272ac6c610c48205608be0b9e98ce44218dd200a27 SHA512 4173c7b0cf4f0399a3d36c987d265aacf766f54dc871ca87ebd98d4ecd4fbd24d4b923ffb2d0b59bda359e1fbba29f088d78816d375904b1945e8c40c29dccce diff --git a/dev-libs/c-blosc2/c-blosc2-2.14.3.ebuild b/dev-libs/c-blosc2/c-blosc2-2.14.3.ebuild deleted file mode 100644 index 83ec7fc645ac..000000000000 --- a/dev-libs/c-blosc2/c-blosc2-2.14.3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Blocking, shuffling and lossless compression library" -HOMEPAGE=" - https://www.blosc.org/c-blosc2/c-blosc2.html - https://github.com/Blosc/c-blosc2/ -" -SRC_URI=" - https://github.com/Blosc/c-blosc2/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="BSD" -SLOT="0/1" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="test +zlib +zstd" -REQUIRED_USE="test? ( zlib zstd )" -RESTRICT="!test? ( test )" - -DEPEND=" - >=app-arch/lz4-1.7.5:= - zlib? ( sys-libs/zlib:= ) - zstd? ( app-arch/zstd:= ) -" -RDEPEND=" - ${DEPEND} -" - -src_configure() { - # remove bundled libs (just in case) - rm -rf internal-complibs || die - - local mycmakeargs=( - -DBUILD_STATIC=OFF - -DBUILD_TESTS=$(usex test) - -DBUILD_BENCHMARKS=OFF - -DBUILD_EXAMPLES=OFF - -DBUILD_FUZZERS=OFF - -DDEACTIVATE_ZLIB=$(usex !zlib) - -DDEACTIVATE_ZSTD=$(usex !zstd) - -DPREFER_EXTERNAL_LZ4=ON - -DPREFER_EXTERNAL_ZLIB=ON - -DPREFER_EXTERNAL_ZSTD=ON - - # force regular zlib, at least for the time being - -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB_NG=ON - - # upstream overrides CMAKE_C_FLAGS, preventing ${CFLAGS} defaults - # from applying, https://github.com/Blosc/c-blosc2/issues/433 - -DCMAKE_C_FLAGS="${CFLAGS}" - ) - cmake_src_configure -} - -src_test() { - # Tests fail in parallel, https://github.com/Blosc/c-blosc2/issues/432 - MAKEOPTS=-j1 cmake_src_test -} diff --git a/dev-libs/c-blosc2/c-blosc2-2.14.4.ebuild b/dev-libs/c-blosc2/c-blosc2-2.14.4.ebuild new file mode 100644 index 000000000000..21d8413c0e29 --- /dev/null +++ b/dev-libs/c-blosc2/c-blosc2-2.14.4.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Blocking, shuffling and lossless compression library" +HOMEPAGE=" + https://www.blosc.org/c-blosc2/c-blosc2.html + https://github.com/Blosc/c-blosc2/ +" +SRC_URI=" + https://github.com/Blosc/c-blosc2/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="BSD" +SLOT="0/3" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="test +zlib +zstd" +REQUIRED_USE="test? ( zlib zstd )" +RESTRICT="!test? ( test )" + +DEPEND=" + >=app-arch/lz4-1.7.5:= + zlib? ( sys-libs/zlib:= ) + zstd? ( app-arch/zstd:= ) +" +RDEPEND=" + ${DEPEND} +" + +src_configure() { + # remove bundled libs (just in case) + rm -rf internal-complibs || die + + local mycmakeargs=( + -DBUILD_STATIC=OFF + -DBUILD_TESTS=$(usex test) + -DBUILD_BENCHMARKS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_FUZZERS=OFF + -DDEACTIVATE_ZLIB=$(usex !zlib) + -DDEACTIVATE_ZSTD=$(usex !zstd) + -DPREFER_EXTERNAL_LZ4=ON + -DPREFER_EXTERNAL_ZLIB=ON + -DPREFER_EXTERNAL_ZSTD=ON + + # force regular zlib, at least for the time being + -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB_NG=ON + + # upstream overrides CMAKE_C_FLAGS, preventing ${CFLAGS} defaults + # from applying, https://github.com/Blosc/c-blosc2/issues/433 + -DCMAKE_C_FLAGS="${CFLAGS}" + ) + cmake_src_configure +} + +src_test() { + # Tests fail in parallel, https://github.com/Blosc/c-blosc2/issues/432 + MAKEOPTS=-j1 cmake_src_test +} diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest index 3a1f8f6e659e..080fa756df8b 100644 --- a/dev-libs/flatbuffers/Manifest +++ b/dev-libs/flatbuffers/Manifest @@ -1,2 +1 @@ DIST flatbuffers-24.3.25.gh.tar.gz 2297829 BLAKE2B f3a5a94119a1b1b63fba9126e1cdff7ab712996bfc0d65626a679405f62dfa722bc5de244ef775fba336224b60feff3aa27acf54bed027c4013590b4afbefe7c SHA512 e2a614f4fc526ce07bfe1e1bc79efd3c87acbdb93aee7b42994d4855abd2593f36b5ca1edb53c7dcd470d5fbe14a3e394bd75dcebb4458cc0aeb33d622a3c662 -DIST flatbuffers-24.3.7.gh.tar.gz 2296896 BLAKE2B 439d84a58ed169f6cd980388034f3dfaf53444dc4733b942aeeac24ed805dcf7c4348df8080fdbd899d2b4bc7f1ad75f546f8db3bcbb6fc942b75e2c3877331e SHA512 93541cbc6c1ba96beed77967d89693ebbc532664ee3b39eb9df9ec28871a3a0acb744b9c823afe6d3c480fe34e092306100e67f5b8fbed4432a875e87670019e diff --git a/dev-libs/flatbuffers/flatbuffers-24.3.25.ebuild b/dev-libs/flatbuffers/flatbuffers-24.3.25.ebuild index c03ba67b3e92..ead2e8a0a127 100644 --- a/dev-libs/flatbuffers/flatbuffers-24.3.25.ebuild +++ b/dev-libs/flatbuffers/flatbuffers-24.3.25.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86" IUSE="static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/flatbuffers/flatbuffers-24.3.7.ebuild b/dev-libs/flatbuffers/flatbuffers-24.3.7.ebuild deleted file mode 100644 index ead2e8a0a127..000000000000 --- a/dev-libs/flatbuffers/flatbuffers-24.3.7.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Memory efficient serialization library" -HOMEPAGE=" - https://flatbuffers.dev/ - https://github.com/google/flatbuffers/ -" -SRC_URI=" - https://github.com/google/flatbuffers/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86" -IUSE="static-libs test" -RESTRICT="!test? ( test )" - -src_configure() { - local mycmakeargs=( - -DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs) - -DFLATBUFFERS_BUILD_SHAREDLIB=ON - -DFLATBUFFERS_BUILD_TESTS=$(usex test) - -DFLATBUFFERS_BUILD_BENCHMARKS=OFF - ) - - cmake_src_configure -} diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index 9e3c87a23426..0967ffcbbf05 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -1,3 +1 @@ -DIST gjs-1.78.1.tar.xz 654556 BLAKE2B 1d723ad2fd15e7ba6b9194cb90f0c0bc7b89c150604beb11ad95e1628ead2bea7ed8b423e1836736013a31e8ff8f3e2400458faa26dcc95d3a6dc36c65957583 SHA512 9a5d02bacbf82364cf5daa69d6613eb38ef34121eb350b2773b87cf1027ccc1b9905b651275fd71036817e710d834d356ee1cecac2f7c83ff571c39e98360286 -DIST gjs-1.78.4.tar.xz 655220 BLAKE2B 0adcc3d0cc88a36b94b2113a6d88ded9be7fa034392fa38abb9ac22a962fb8601a76b6c886500e48c40fbe8708b3164b1d403dd83cd4e77358a4a020e8c15632 SHA512 a402050cee011a84f0ebb6b1512a2e681e792cf559b3182ece0868e57191be64337d6683ebcb8a7ee89ba79c12947a8cbca85f015c6015d26901352b5255c2c4 DIST gjs-1.78.5.tar.xz 656168 BLAKE2B e1458d000998b66fda90e448ca487e591729e003c3e11a939dc474958b6de55783d41db8de5b243a329361f12acc15a8e84f4131650705becb046b68c54a24a2 SHA512 bb25e52dff53bfbde6d2329027d4ff68849740cf753da58f9bdf5a19ea7b029e2517d67978f461f16660dd1aa48b223798e9c0a24cde0ccb62060e4a0c83a02e diff --git a/dev-libs/gjs/gjs-1.78.1.ebuild b/dev-libs/gjs/gjs-1.78.1.ebuild deleted file mode 100644 index 805b43049029..000000000000 --- a/dev-libs/gjs/gjs-1.78.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic gnome.org meson virtualx - -DESCRIPTION="Javascript bindings for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs" - -LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" -SLOT="0" -IUSE="+cairo examples readline sysprof test" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.66.0:2 - dev-libs/libffi:= - >=dev-libs/gobject-introspection-1.71.1:= - dev-lang/spidermonkey:115 - cairo? ( x11-libs/cairo[X,glib] ) - readline? ( sys-libs/readline:0= ) -" -DEPEND="${RDEPEND} - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) - test? ( - sys-apps/dbus - >=x11-libs/gtk+-3.20:3[introspection] - ) -" -BDEPEND=" - virtual/pkgconfig -" - -src_configure() { - append-cppflags -DG_DISABLE_CAST_CHECKS - - # On musl, it's required that either gjs, pixman or gnome-shell to be built - # with a larger stack otherwise librsvg fails to render a particular SVG, as - # a result we fail to get gdm or gnome-shell running (greeted with a fail - # whale screen). The bug has been reported to librsvg. This is ideally just - # a temporary workaround until we understand what exactly needs a larger - # stack size, as it's not sufficient to do just librsvg. - # - # Please refer to: - # https://gitlab.gnome.org/GNOME/librsvg/-/issues/686 - # https://gitlab.gnome.org/GNOME/librsvg/-/issues/874 - # - # TODO: Find an actual fix instead of increasing the stack - use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 - - # FIXME: add systemtap/dtrace support, like in glib:2 - local emesonargs=( - $(meson_feature cairo) - $(meson_feature readline) - $(meson_feature sysprof profiler) - -Dinstalled_tests=false - $(meson_use !test skip_dbus_tests) - $(meson_use !test skip_gtk_tests) - -Db_pch=True # TODO this has to go - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} diff --git a/dev-libs/gjs/gjs-1.78.4.ebuild b/dev-libs/gjs/gjs-1.78.4.ebuild deleted file mode 100644 index f9d52d43c6ba..000000000000 --- a/dev-libs/gjs/gjs-1.78.4.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic gnome.org meson virtualx - -DESCRIPTION="Javascript bindings for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs" - -LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" -SLOT="0" -IUSE="+cairo examples readline sysprof test" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.66.0:2 - dev-libs/libffi:= - >=dev-libs/gobject-introspection-1.71.1:= - dev-lang/spidermonkey:115 - cairo? ( x11-libs/cairo[X,glib] ) - readline? ( sys-libs/readline:0= ) -" -DEPEND="${RDEPEND} - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) - test? ( - sys-apps/dbus - >=x11-libs/gtk+-3.20:3[introspection] - ) -" -BDEPEND=" - virtual/pkgconfig -" - -src_configure() { - append-cppflags -DG_DISABLE_CAST_CHECKS - - # On musl, it's required that either gjs, pixman or gnome-shell to be built - # with a larger stack otherwise librsvg fails to render a particular SVG, as - # a result we fail to get gdm or gnome-shell running (greeted with a fail - # whale screen). The bug has been reported to librsvg. This is ideally just - # a temporary workaround until we understand what exactly needs a larger - # stack size, as it's not sufficient to do just librsvg. - # - # Please refer to: - # https://gitlab.gnome.org/GNOME/librsvg/-/issues/686 - # https://gitlab.gnome.org/GNOME/librsvg/-/issues/874 - # - # TODO: Find an actual fix instead of increasing the stack - use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 - - # FIXME: add systemtap/dtrace support, like in glib:2 - local emesonargs=( - $(meson_feature cairo) - $(meson_feature readline) - $(meson_feature sysprof profiler) - -Dinstalled_tests=false - $(meson_use !test skip_dbus_tests) - $(meson_use !test skip_gtk_tests) - -Db_pch=True # TODO this has to go - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest index c5c32b61bb00..f608314fdb57 100644 --- a/dev-libs/gmime/Manifest +++ b/dev-libs/gmime/Manifest @@ -1,3 +1,2 @@ DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14 -DIST gmime-3.2.13.tar.xz 2231624 BLAKE2B c1b4af7ea911c6e2cdea01700d76d218028f7a7f3fc0443b15f915658f945b0fd784928eaa572b0a4b1cd2ea6f7b2812de75f066e3dd2bef23ebd4075a393ee9 SHA512 cfbf5d9e8d6cafcb340b6e470acaf7ae0a96581d39119a751b22fcf3ede089cc24accbd26a79ec2a4b7901ce66d7092765e8c388bbfa2138606dbb4b3f81f4d3 DIST gmime-3.2.14.tar.xz 2231340 BLAKE2B bbe147151349c626d92890783a3fccd4b1156b5a9fc305812447f28ec34d5d7694a702f99865ad5ef41737eb4e0d0c08d879e4525f58c272972531c51d436fd6 SHA512 d6127a8567f96784b3f975452cd43a4ef6c8921845feb11974f785576f7ef138f25d20d0f309022893ca445fffb000b4dc98bf65ff3a781ececd5c16b1f0e9c6 diff --git a/dev-libs/gmime/gmime-3.2.13.ebuild b/dev-libs/gmime/gmime-3.2.13.ebuild deleted file mode 100644 index 209667ccf128..000000000000 --- a/dev-libs/gmime/gmime-3.2.13.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic gnome2 vala - -DESCRIPTION="Library for creating and parsing MIME messages" -HOMEPAGE="https://github.com/jstedfast/gmime http://spruce.sourceforge.net/gmime/" -SRC_URI="https://github.com/jstedfast/${PN}/releases/download/${PV}/${P}.tar.xz" - -SLOT="3.0" -LICENSE="LGPL-2.1+" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="crypt doc idn test +vala" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.68.0:2 - sys-libs/zlib - crypt? ( >=app-crypt/gpgme-1.8.0:= ) - idn? ( net-dns/libidn2:= ) - vala? ( - $(vala_depend) - >=dev-libs/gobject-introspection-1.30.0:= - ) -" -DEPEND="${RDEPEND} - virtual/libiconv -" -BDEPEND=" - >=dev-build/gtk-doc-am-1.8 - virtual/pkgconfig - doc? ( app-text/docbook-sgml-utils ) -" - -src_prepare() { - gnome2_src_prepare - use vala && vala_setup -} - -src_configure() { - if [[ ${CHOST} == *-solaris* ]]; then - # bug #???, why not use --with-libiconv - append-libs iconv - fi - - gnome2_src_configure \ - --enable-largefile \ - $(use_enable crypt crypto) \ - $(use_enable vala) \ - $(use_with idn libidn) \ - $(usex doc "" DB2HTML=) -} - -src_compile() { - gnome2_src_compile - if use doc; then - emake -C docs/tutorial html - fi -} - -src_install() { - gnome2_src_install - - if use doc ; then - docinto tutorial - dodoc -r docs/tutorial/html/ - fi -} diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest deleted file mode 100644 index 92924af20c50..000000000000 --- a/dev-libs/hyperscan/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST hyperscan-5.4.2.tar.gz 1848851 BLAKE2B a4539df7c6a4b5f097effa67bc777c37ff02aae356953acd4ffe871f621c556f6357c37ad813db144ed50af21881838946b7cb5ef9ea345412de908b84497dac SHA512 328f21133161d16b36ebdc7f8b80a7afe7ca9e7e7433348e9bfa9acb5f3641522e8314beea1b219891f4e95f1392ff8036ebb87780fe808b8b4bd15a535e9509 diff --git a/dev-libs/hyperscan/hyperscan-5.4.2.ebuild b/dev-libs/hyperscan/hyperscan-5.4.2.ebuild deleted file mode 100644 index 7c6fac198c94..000000000000 --- a/dev-libs/hyperscan/hyperscan-5.4.2.ebuild +++ /dev/null @@ -1,65 +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 cmake flag-o-matic python-any-r1 - -DESCRIPTION="High-performance regular expression matching library" -SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE=" - https://www.hyperscan.io/ - https://github.com/intel/hyperscan -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="cpu_flags_x86_avx2 cpu_flags_x86_ssse3" - -RDEPEND="dev-libs/boost:=" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - dev-util/ragel -" - -# We can't default this to on as it's against the expectation of -# how CPU_FLAGS_* work for users. -REQUIRED_USE="cpu_flags_x86_ssse3" - -src_prepare() { - # Respect user -O flags - sed -i '/set(OPT_CX*_FLAG/d' CMakeLists.txt || die - - # upstream workaround - append-cxxflags -Wno-redundant-move - cmake_src_prepare -} - -src_configure() { - use cpu_flags_x86_ssse3 && append-flags -mssse3 - use cpu_flags_x86_avx2 && append-flags -mavx2 - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DBUILD_STATIC_AND_SHARED=OFF - -DBUILD_EXAMPLES=OFF - -DFAT_RUNTIME=false - ) - cmake_src_configure -} - -src_test() { - "${BUILD_DIR}"/bin/unit-hyperscan || die -} - -pkg_postinst() { - if has_version ' - - - - arkamar@gentoo.org - Petr Vaněk - - - intel/hyperscan - - diff --git a/dev-libs/hyprlang/hyprlang-0.5.0.ebuild b/dev-libs/hyprlang/hyprlang-0.5.0.ebuild index 4c7b562223db..9884a4ce9a12 100644 --- a/dev-libs/hyprlang/hyprlang-0.5.0.ebuild +++ b/dev-libs/hyprlang/hyprlang-0.5.0.ebuild @@ -11,4 +11,4 @@ SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~riscv" diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest index 70caa30f8e66..32e382728b50 100644 --- a/dev-libs/kopeninghours/Manifest +++ b/dev-libs/kopeninghours/Manifest @@ -1,2 +1,2 @@ DIST kopeninghours-23.08.5.tar.xz 72568 BLAKE2B 84e418d95f4a7261786a101882000bed0ca721931cc419e0330edb0f659e38459063d49c75ca643d169e9326ed66694130cfeebef51183c89e02efd02f6f3133 SHA512 a95cd3c446699d8bd95f2f746cb8b4187c7d2027067e5c731afe371a3313a5569780110e8acbf52d125da673aff4b2567da9f2b8c07a4412cf1d7540baad7a14 -DIST kopeninghours-24.02.1.tar.xz 73344 BLAKE2B 4102d4040cea716bf1c12faca7aebf46d22636d2360c554d281f1b67ac9fa46d9b45a7d2d2a84500b2169a7639f1f892bd85899493f2bef0ebcc58f42802655a SHA512 126426103cff6974fa995356df67988dd8438e20ec2d9aa407e396d6971b2fe422e1009331d4d740da4a04eb04ac83eb2b493766b7d7af04209779ed6b9358da +DIST kopeninghours-24.02.2.tar.xz 73660 BLAKE2B 779ea9c966c7223e80bb88120d6cfc581597d5b27c1e716fd30d21815814dfd406ae2c904c772a4ef0e97b1f951c1e82a4572d4c0ce995d6f79c75905a7eca07 SHA512 1540dc045e65c9751c5571b3e2c170f03474282c8e342c41af3101034bdddc8af9e9de17b63b0f3515672b0fcb8a821f5a5acfa074814639f3957aed9e53d857 diff --git a/dev-libs/kopeninghours/kopeninghours-24.02.1.ebuild b/dev-libs/kopeninghours/kopeninghours-24.02.2.ebuild similarity index 100% rename from dev-libs/kopeninghours/kopeninghours-24.02.1.ebuild rename to dev-libs/kopeninghours/kopeninghours-24.02.2.ebuild diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest index c67e93bfdae8..47921034114d 100644 --- a/dev-libs/kosmindoormap/Manifest +++ b/dev-libs/kosmindoormap/Manifest @@ -1,2 +1,2 @@ DIST kosmindoormap-23.08.5.tar.xz 384948 BLAKE2B 0936fe42b0c370dc0c57d475aa771784c75e8350e2d563140c027d047514840f99d6697e36fde027da11e22a92239b6403cf1b18a37aa8e09a3f8814cb6931c8 SHA512 9128cccbd56f51b1e8ad7f7151db0de8952a8348fb74afe3eefeb085979b26d95d1699f260d744c4f3ea5d815109f998829625db480194a8539e782e8c32537c -DIST kosmindoormap-24.02.1.tar.xz 634452 BLAKE2B 4ee7b5da52acf8572604950521fa3bd36da542672b47f3cd07266a394d6745ca7da3994c96663fd529ac9667648f3a9615a2741a8304b26bb97d589dadad4556 SHA512 b81a080f0f9203d50e56356529db4257157bd3604310643965b9e02323d07632cb21b7bf90e6093b5c718e16b7c09c7e95712a91314063aae0bdf99f76704a14 +DIST kosmindoormap-24.02.2.tar.xz 634668 BLAKE2B 785804d28905657d476a52c727e337abdb97900cff57880126dfbc920b3a2fb3264f0a6bf6b4186f88977db55c63b9e8f655af815931eec3b8784c2777ca3a8e SHA512 1edde1b613758f20028f3b92d517e8126712e069651d1e349cddb73676218d60e84e29412e7ae397dd892501a4ef116c0b7a17e976d378904e2c820edd049d5a diff --git a/dev-libs/kosmindoormap/kosmindoormap-24.02.1.ebuild b/dev-libs/kosmindoormap/kosmindoormap-24.02.2.ebuild similarity index 100% rename from dev-libs/kosmindoormap/kosmindoormap-24.02.1.ebuild rename to dev-libs/kosmindoormap/kosmindoormap-24.02.2.ebuild diff --git a/dev-libs/kpublictransport/Manifest b/dev-libs/kpublictransport/Manifest index 638956e890f2..11edbabf08c1 100644 --- a/dev-libs/kpublictransport/Manifest +++ b/dev-libs/kpublictransport/Manifest @@ -1,2 +1,2 @@ DIST kpublictransport-23.08.5.tar.xz 572952 BLAKE2B 9628dfba5f73b76594b3bb97b7e4996267f9bb7f9acc024de003e28dd9754bf1c7226eb85aeae27784752356688abe28ec85b93b028c863f2c8edf9d645fd54d SHA512 43c58c14ee5827579ffcf97c42c4ac844f49c05f5e68f441c6d3d2a32bf074de08f7daf14b3ca32b25101215943601204837e5ad4e7841cd9984745769b4008f -DIST kpublictransport-24.02.1.tar.xz 605936 BLAKE2B d0cedc5fc1295eff47d1f7d35b91b70cc2d4577c88d48a82e10d26143f5099f6668054e4af5ca961bc47af40d72ad28d149c329c3ae5f08655ae89ad89e5ecfa SHA512 e3301da676a68bfbc718504583d41af20d57dc9f56fa1578a595d9ac926a77de65d5ca102452bb3a26dad359d2326b63ee0c442f99121554070e69775a0d7a59 +DIST kpublictransport-24.02.2.tar.xz 605964 BLAKE2B 8587067e083d4aab15a015e0bd67964995823737213efb3770a05d90fd207262e9ff43abdf967f3164ca40dac25ef53c97ac96d3cf9cc5df05d59866cf060c41 SHA512 5de51775833138879e943a910d8221423dbc68fa4471795e96a0c1fc709f7fd35fa45632a3dc87173d03fa89dcca27e300313e28ef2656b1e7acb7e36e0ececb diff --git a/dev-libs/kpublictransport/kpublictransport-24.02.1.ebuild b/dev-libs/kpublictransport/kpublictransport-24.02.2.ebuild similarity index 100% rename from dev-libs/kpublictransport/kpublictransport-24.02.1.ebuild rename to dev-libs/kpublictransport/kpublictransport-24.02.2.ebuild diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest index 4321fde65787..7ca6271a9449 100644 --- a/dev-libs/leatherman/Manifest +++ b/dev-libs/leatherman/Manifest @@ -1 +1,2 @@ DIST leatherman-1.12.12.tar.gz 818006 BLAKE2B b8174da6ae3f981b9ef44728069502264585b6ec8602125e54e2747c6f4ce1755979c4c7337af176bba234dcb6415acdbdff69b1a4c60ec87b69892043b91353 SHA512 b4041ec59dd716e599c12c31dd5401542efe0739abfc9d508b56dc759ca9bdeb29daac87b626d416f5339fca8909cfa98653a24a39b32bb1cd04baf99c6f1d92 +DIST leatherman-1.12.13.tar.gz 818810 BLAKE2B 3caf99e7a266703e4c84797ecdb5f4006474c5bc7014dee2dddcbf51ec38c0337027c8ee49c52a54d68450abf57605a8482b52d6a63a0fe5f4eeb554adea90c7 SHA512 5d45036839270690f8f6649ea82d3800eec89a6fff92416a2e9831a177a1ddd6b42a33bc8af94a410c65c768c962b5fafc696f579f3de411b41cb5ae88b1372f diff --git a/dev-libs/leatherman/leatherman-1.12.13.ebuild b/dev-libs/leatherman/leatherman-1.12.13.ebuild new file mode 100644 index 000000000000..7508537d3159 --- /dev/null +++ b/dev-libs/leatherman/leatherman-1.12.13.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="A C++ toolkit" +HOMEPAGE="https://github.com/puppetlabs/leatherman" +SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="debug static-libs test" +#RESTRICT="!test? ( test )" +RESTRICT="test" # restricted til we don't need the shared_nowide patch + +RDEPEND="dev-libs/boost:=[nls] + net-misc/curl" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/portage-sandbox-test-fix.patch + "${FILESDIR}"/1.12.2-shared_nowide.patch +) + +src_prepare() { + sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die + # vendored boost lib conflicts with boost 1.73 and above + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_VERBOSE_MAKEFILE=ON + -DCMAKE_BUILD_TYPE=None + -DLEATHERMAN_ENABLE_TESTING=$(usex test) + # We depend on Boost with nls, so this is always true + -DLEATHERMAN_USE_ICU=ON + + -DLEATHERMAN_SHARED=$(usex !static-libs) + ) + + if use debug; then + mycmakeargs+=( + -DCMAKE_BUILD_TYPE=Debug + ) + fi + + cmake_src_configure +} + +src_test() { + "${WORKDIR}/${P}"_build/bin/leatherman_test || die +} diff --git a/dev-libs/leveldb/leveldb-1.23-r5.ebuild b/dev-libs/leveldb/leveldb-1.23-r5.ebuild deleted file mode 100644 index b484578cd53d..000000000000 --- a/dev-libs/leveldb/leveldb-1.23-r5.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="A fast key-value storage library written at Google" -HOMEPAGE="https://github.com/google/leveldb" -SRC_URI="https://github.com/google/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/1" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+snappy +tcmalloc test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/crc32c - snappy? ( app-arch/snappy:= ) - tcmalloc? ( dev-util/google-perftools:=[-minimal] ) -" -RDEPEND="${DEPEND}" -BDEPEND="test? ( dev-cpp/gtest )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.23-system-testdeps.patch - "${FILESDIR}"/${PN}-1.23-remove-benchmark-dep.patch -) - -src_prepare() { - sed -e '/fno-rtti/d' -i CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_CXX_STANDARD=14 # C++14 or later required for >=gtest-1.13.0 - -DHAVE_CRC32C=ON - -DLEVELDB_BUILD_BENCHMARKS=OFF - -DHAVE_SNAPPY=$(usex snappy) - -DHAVE_TCMALLOC=$(usex tcmalloc) - -DLEVELDB_BUILD_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_test() { - TEST_TMPDIR="${T}" TEMP="${T}" cmake_src_test -} diff --git a/dev-libs/leveldb/leveldb-1.23-r6.ebuild b/dev-libs/leveldb/leveldb-1.23-r6.ebuild new file mode 100644 index 000000000000..c963638d5fd9 --- /dev/null +++ b/dev-libs/leveldb/leveldb-1.23-r6.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A fast key-value storage library written at Google" +HOMEPAGE="https://github.com/google/leveldb" +SRC_URI="https://github.com/google/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/1" +KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +IUSE="+snappy +tcmalloc test" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/crc32c + snappy? ( app-arch/snappy:= ) + tcmalloc? ( dev-util/google-perftools:=[-minimal] ) +" +RDEPEND="${DEPEND}" +BDEPEND="test? ( dev-cpp/gtest )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.23-system-testdeps.patch + "${FILESDIR}"/${PN}-1.23-remove-benchmark-dep.patch +) + +src_prepare() { + sed -e '/fno-rtti/d' -i CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_CXX_STANDARD=14 # C++14 or later required for >=gtest-1.13.0 + -DHAVE_CRC32C=ON + -DLEVELDB_BUILD_BENCHMARKS=OFF + -DHAVE_SNAPPY=$(usex snappy) + -DHAVE_TCMALLOC=$(usex tcmalloc) + -DLEVELDB_BUILD_TESTS=$(usex test) + -DHAVE_CLANG_THREAD_SAFETY=OFF # adds -Werror to current build and all revdeps + ) + cmake_src_configure +} + +src_test() { + TEST_TMPDIR="${T}" TEMP="${T}" cmake_src_test +} diff --git a/dev-libs/libaio/libaio-0.3.113-r1.ebuild b/dev-libs/libaio/libaio-0.3.113-r1.ebuild index b931b5e9c63d..0206e9375e8f 100644 --- a/dev-libs/libaio/libaio-0.3.113-r1.ebuild +++ b/dev-libs/libaio/libaio-0.3.113-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://pagure.io/libaio.git" else SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" fi LICENSE="LGPL-2" diff --git a/dev-libs/libburn/libburn-1.5.6-r1.ebuild b/dev-libs/libburn/libburn-1.5.6-r1.ebuild index 4fbb4fffbea8..d669c0ff6bfd 100644 --- a/dev-libs/libburn/libburn-1.5.6-r1.ebuild +++ b/dev-libs/libburn/libburn-1.5.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://files.libburnia-project.org/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" IUSE="debug static-libs" BDEPEND=" diff --git a/dev-libs/libdex/Manifest b/dev-libs/libdex/Manifest index a97ca34b1c7d..873da4389984 100644 --- a/dev-libs/libdex/Manifest +++ b/dev-libs/libdex/Manifest @@ -1,2 +1 @@ -DIST libdex-0.4.1.tar.xz 95492 BLAKE2B 73e660cd5876f41f7e02bdb35cc460888eaf40a62c7431e7fcd2337a2eb953f975a8f6719c0726672be71ab507561413257c140a31cfdcab09491d4228362796 SHA512 80a80c6fcf936da903a64339dff1d6f802f028bfd6e2815bf3b2a3ac6bd0e9fafe3f81b66dd1ee0a6bbd6303cc31fc73b528829e587142a7d269b1b98377ca25 DIST libdex-0.4.3.tar.xz 96820 BLAKE2B 51f6c9a209d8ff19d7e97f4d8cbc9065739f08c555712076c9b6f4d345d56522f31afa1b8dffe8da2cfc128d368d7dc5f6a93757f0fe5cfd0a55de17587d776e SHA512 26691373d560d20cefa3a23e31677259b234cdf623b17b8fb2b6976b03768e86e458d2670aa3b260638b595994f278240e972bf3ff5b765013fb6d3114f46cef diff --git a/dev-libs/libdex/libdex-0.4.1.ebuild b/dev-libs/libdex/libdex-0.4.1.ebuild deleted file mode 100644 index 0c9580a83095..000000000000 --- a/dev-libs/libdex/libdex-0.4.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org meson vala - -DESCRIPTION="Deferred Execution library for GNOME and GTK" -HOMEPAGE="https://gitlab.gnome.org/GNOME/libdex" - -LICENSE="LGPL-2.1+" -SLOT="0/1" -KEYWORDS="amd64 ~arm64 ~x86" - -IUSE="gtk-doc +introspection sysprof test vala" -REQUIRED_USE=" - gtk-doc? ( introspection ) - vala? ( introspection ) -" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.68:2 - >=sys-libs/liburing-0.7:= - introspection? ( dev-libs/gobject-introspection:= ) - sysprof? ( dev-util/sysprof-capture:4 ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - vala? ( $(vala_depend) ) - dev-util/glib-utils - virtual/pkgconfig - gtk-doc? ( dev-util/gi-docgen ) -" - -src_prepare() { - default - use vala && vala_setup -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc docs) - -Dexamples=false - $(meson_use vala vapi) - $(meson_feature introspection) - $(meson_use sysprof) - $(meson_use test tests) - ) - meson_src_configure -} - -src_install() { - meson_src_install - - if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die - mv "${ED}"/usr/share/doc/${PN}-1 "${ED}"/usr/share/gtk-doc/html/ || die - fi -} diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch b/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch index ce3a15b5e160..88de87fe6595 100644 --- a/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch +++ b/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch @@ -1,5 +1,5 @@ ---- configure.in.orig 2009-04-26 23:00:43.445135823 +0300 -+++ configure.in 2009-04-26 23:25:04.042489243 +0300 +--- gamin-0.1.10/configure.in ++++ gamin-0.1.10/configure.in @@ -389,8 +389,7 @@ AC_MSG_CHECKING(abstract socket namespace) diff --git a/dev-libs/libgamin/libgamin-0.1.10-r7.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r7.ebuild new file mode 100644 index 000000000000..3e0d9572036a --- /dev/null +++ b/dev-libs/libgamin/libgamin-0.1.10-r7.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GNOME_ORG_MODULE="gamin" +GNOME_TARBALL_SUFFIX="bz2" + +inherit autotools gnome.org multilib-minimal + +DESCRIPTION="Library providing the FAM File Alteration Monitor API" +HOMEPAGE="https://www.gnome.org/~veillard/gamin/" +SRC_URI="${SRC_URI} + mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 + https://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2 + https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="debug static-libs" + +RESTRICT="test" # needs gam-server + +RDEPEND=" + !app-admin/fam + !=clang-18 regression (bug #929228) + tc-is-clang && [[ $(clang-major-version) -ge 18 ]] && + mycmakeargs+=( -DNCNN_AVX512BF16=no ) + cmake_src_configure } diff --git a/dev-libs/ncnn/ncnn-20240410.ebuild b/dev-libs/ncnn/ncnn-20240410.ebuild new file mode 100644 index 000000000000..2bb0594c7321 --- /dev/null +++ b/dev-libs/ncnn/ncnn-20240410.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="High-performance neural network inference framework" +HOMEPAGE="https://github.com/Tencent/ncnn/" +SRC_URI=" + https://github.com/Tencent/ncnn/archive/refs/tags/${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="BSD ZLIB" +SLOT="0/${PV}" # currently has unstable ABI that often requires rebuilds +KEYWORDS="~amd64 ~x86" +IUSE="openmp tools +vulkan" + +# Need the static library to run tests + skip vulkan / GPU: +# -DNCNN_BUILD_TESTS=ON -DNCNN_SHARED_LIB=OFF -DNCNN_VULKAN=OFF +RESTRICT="test" + +RDEPEND=" + tools? ( + dev-cpp/abseil-cpp:= + dev-libs/protobuf:= + ) + vulkan? ( + dev-util/glslang:= + media-libs/vulkan-loader + ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" + +DOCS=( README.md docs/. ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + local mycmakeargs=( + -DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake + -DNCNN_BUILD_EXAMPLES=no + -DNCNN_BUILD_TOOLS=$(usex tools) + -DNCNN_OPENMP=$(usex openmp) + -DNCNN_PYTHON=no # todo if something needs it + -DNCNN_SHARED_LIB=yes + -DNCNN_SIMPLEVK=no + -DNCNN_SYSTEM_GLSLANG=yes + -DNCNN_VERSION=${PV} # avoids libncnn.so.*.%Y%m%d using build date + -DNCNN_VULKAN=$(usex vulkan) + ) + + # temporary workaround due to a >=clang-18 regression (bug #929228) + tc-is-clang && [[ $(clang-major-version) -ge 18 ]] && + mycmakeargs+=( -DNCNN_AVX512BF16=no ) + + cmake_src_configure +} diff --git a/dev-libs/simde/simde-0.8.0-r1.ebuild b/dev-libs/simde/simde-0.8.0-r1.ebuild index faa2b4cedb06..155e4c169087 100644 --- a/dev-libs/simde/simde-0.8.0-r1.ebuild +++ b/dev-libs/simde/simde-0.8.0-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/template-glib/Manifest b/dev-libs/template-glib/Manifest index 82d553c1ab86..f9e0eafff4e0 100644 --- a/dev-libs/template-glib/Manifest +++ b/dev-libs/template-glib/Manifest @@ -1,2 +1 @@ -DIST template-glib-3.36.1.tar.xz 64580 BLAKE2B 3dbedb59c769ec169d469ae6640d9319c8d3ec09aa91cadc4be64290401f36b83e514c0dc8c03fb0eddefef0ddc0a717fdbad12e67c9aaf6d4b291b00b289d02 SHA512 7c00d750f7d58e98f2d6c9baa6fa84efde1cce2eaacfb334ef0ee19d0583373d303d67d43cc290cd1a41239f2ee804077e104bb4799b70cfd6760ac3fb04178e DIST template-glib-3.36.2.tar.xz 64832 BLAKE2B 63d413b8474ea641cb8ad3eecc69f4fefbb1b3d5b9a3ec1bc4dd7ddd3526ca3c8599bf811041df6685daa868ff5c302d650b1fc956a441a5d2b80adc069453ae SHA512 226247151c932931a3c5c0f2278929ab6e6e82edbcab10dead5723ee4b8ef5c6d12775491b1aed7e7ccfee8b794be69a8c457e6639a63fdfc2b6e41d7efc2bee diff --git a/dev-libs/template-glib/template-glib-3.36.1.ebuild b/dev-libs/template-glib/template-glib-3.36.1.ebuild deleted file mode 100644 index 52a0c01b99f1..000000000000 --- a/dev-libs/template-glib/template-glib-3.36.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org meson vala - -DESCRIPTION="Templating library for GLib" -HOMEPAGE="https://gitlab.gnome.org/GNOME/template-glib" - -LICENSE="LGPL-2.1+" -SLOT="0/1" -KEYWORDS="amd64 ~arm64 x86" - -IUSE="gtk-doc +introspection test vala" -RESTRICT="!test? ( test )" -REQUIRED_USE="vala? ( introspection )" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/gobject-introspection:= -" # depends on go-i unconditionally for own functionality, USE flag controls GIR/typelib generation -DEPEND="${RDEPEND}" -BDEPEND=" - vala? ( $(vala_depend) ) - dev-util/glib-utils - app-alternatives/yacc - app-alternatives/lex - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc ) -" - -src_prepare() { - default - use vala && vala_setup -} - -src_configure() { - local emesonargs=( - -Dtracing=false # extra trace debugging that would make things slower - -Dprofiling=false # -pg passing - $(meson_feature introspection) - $(meson_use vala vapi) - $(meson_use gtk-doc gtk_doc) - $(meson_use test tests) - ) - meson_src_configure -} diff --git a/dev-libs/thrift/Manifest b/dev-libs/thrift/Manifest index 2d2ae1450f40..88cdbc2d6cce 100644 --- a/dev-libs/thrift/Manifest +++ b/dev-libs/thrift/Manifest @@ -1,2 +1,3 @@ DIST thrift-0.16.0.tar.gz 4085114 BLAKE2B 17c35096f6848fb0795e4cb125fed3068c8e1e53f67f404f4dcab67df7a42fc049a7d615591c861eb9e59e3333e21f185e8615663008bc7c846a03722ea8b834 SHA512 468fff6be2def85959fdf8adac92a0cfa7f786083b3bafb2c31427dfe5725f4d10962052d13ea960828f6a317778d35e66b602744a570212352bfc637ae586e0 DIST thrift-0.18.1.tar.gz 4310494 BLAKE2B 3e6c7e03059341e79d3f58e16b55761888b530b3d31dd22853026486a1303725ee5d5e6e5dd7a5e6bf8e57a2d3cf36ffc829cdb194d990cadedfc63f4f3e0874 SHA512 9c9a462aa8b6fddefd5bb9d2c950570eb2d3beaa7c9d37fceee677bdc1fdeb521b796f4eeee8a1fd9a7649f84449f6c0572305210e67402eb97682ca7f6e851b +DIST thrift-0.20.0.tar.gz 4397667 BLAKE2B 23422fdcdf7e0dbce8bc0f8017f54b5848594e2da21de56834152c17c74da7d1c4df23c5b57cf3ba811bb03f1a8588ddf1c2a05222bb726aceda4292a15af21e SHA512 8dc77f666e60141a6b3cf7ee1407b08a0e80d176f8ccfee69317d7df89ab87aea2c7b3ba3e59d4561835edf1ce23762443ad5aeed0099bf075b010853d5eb1cd diff --git a/dev-libs/thrift/thrift-0.20.0.ebuild b/dev-libs/thrift/thrift-0.20.0.ebuild new file mode 100644 index 000000000000..f57f4a9b262a --- /dev/null +++ b/dev-libs/thrift/thrift-0.20.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="C++ bindings for Apache Thrift" +HOMEPAGE="https://thrift.apache.org/lib/cpp.html" +SRC_URI="mirror://apache/thrift/${PV}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~s390 ~x86" +IUSE="libevent lua +ssl test" + +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/boost:=[nls(+)] + dev-libs/openssl:= + sys-libs/zlib:= + libevent? ( dev-libs/libevent:= ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + app-alternatives/lex + app-alternatives/yacc +" + +REQUIRED_USE=" + test? ( ssl libevent ) +" + +PATCHES=( + "${FILESDIR}/thrift-0.16.0-network-tests.patch" + "${FILESDIR}/thrift-0.18.1-tests.patch" +) + +src_configure() { + local mycmakeargs=( + -DBUILD_CPP=ON + -DBUILD_C_GLIB=OFF + -DBUILD_JAVA=OFF + -DBUILD_JAVASCRIPT=OFF + -DBUILD_NODEJS=OFF + -DBUILD_PYTHON=OFF + -DBUILD_TESTING=$(usex test 'ON' 'OFF') + -DWITH_LIBEVENT=$(usex libevent 'ON' 'OFF') + -DWITH_OPENSSL=$(usex ssl 'ON' 'OFF') + -DWITH_ZLIB=ON + -Wno-dev + ) + cmake_src_configure +} + +src_test() { + MAKEOPTS="-j1" cmake_src_test +} diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild deleted file mode 100644 index 99a530f0613a..000000000000 --- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit gnome.org meson xdg - -DESCRIPTION="Playlist parsing library" -HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/" - -LICENSE="LGPL-2+" -SLOT="0/18" -IUSE="archive crypt gtk-doc +introspection test +uchardet" -RESTRICT="!test? ( test )" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" - -RDEPEND=" - >=dev-libs/glib-2.56:2 - archive? ( >=app-arch/libarchive-3:0= ) - dev-libs/libxml2:2 - crypt? ( dev-libs/libgcrypt:0= ) - uchardet? ( app-i18n/uchardet ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - gtk-doc? ( - >=dev-util/gtk-doc-1.14 - app-text/docbook-xml-dtd:4.3 - ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( - gnome-base/gvfs[http] - sys-apps/dbus - ) -" - -PATCHES=( - "${FILESDIR}"/${PV}-plparser-Fix-uninitialized-variable-error.patch -) - -src_prepare() { - # Disable tests requiring network access, bug #346127 - # 3rd test fails on upgrade, not once installed - # Leio: I consider network tests important for ensuring full functionality, thus trying with them again */ - #sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \ - # -e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \ - # -e 's:\(g_test_add_func.*/parser/parsability.*\):/*\1*/:'\ - # -i plparse/tests/parser.c || die "sed failed" - - xdg_src_prepare -} - -src_configure() { - # uninstalled-tests is abused to switch from loading live FS helper - # to in-build-tree helper, check on upgrades this is not having other - # consequences, bug #630242 - local emesonargs=( - -Denable-libarchive=$(usex archive) - -Denable-libgcrypt=$(usex crypt) - -Denable-uchardet=$(usex uchardet) - $(meson_use gtk-doc enable-gtk-doc) - $(meson_use introspection) - ) - meson_src_configure -} - -src_test() { - # This is required as told by upstream in bgo#629542 - GVFS_DISABLE_FUSE=1 dbus-run-session meson test -C "${BUILD_DIR}" -} diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.21.0-r1.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.21.0-r1.ebuild index b9d109250cad..1b35e389cd19 100644 --- a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.21.0-r1.ebuild +++ b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.21.0-r1.ebuild @@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" diff --git a/dev-libs/tree-sitter-go/Manifest b/dev-libs/tree-sitter-go/Manifest index 5e4d96e64955..939f1d87e1d4 100644 --- a/dev-libs/tree-sitter-go/Manifest +++ b/dev-libs/tree-sitter-go/Manifest @@ -1,2 +1,2 @@ -DIST tree-sitter-go-0.19.1.tar.gz 160180 BLAKE2B f92bbb342eae3a7705dbd6f6564a16fdbad1a25c405970bca1e8df01ff6d0c20b45f9849a0d13d53e2f56d95b71db0f7813765f64e0dcdfd9ca617d1f71e688d SHA512 8390dd3e39daa42ec5254b4c6c0b15fec0caa7ae64a9ec3b9116a10f9e9f1b6940cd88c8cf14dc50b28b97ea588ff302ebd16f3c88e0bd6983e76b5526a31b45 DIST tree-sitter-go-0.20.0-2.tar.gz 195753 BLAKE2B eca2965c0d7bba3c639e092845ac98d05936e9d87290dca2a283dcd6afb1151f8d63aba907337fee79e9fd9b0d901edfda62ec936ef948f57dc663c9d906715b SHA512 ff438a6c84454f38cdefe506f5da787007cb50b3d41bcb9c7f26ed7d951a3268e6bf0b32f2e750d0e4233516c1e4a827c24af831020f81f268fe825adcd5f836 +DIST tree-sitter-go-0.21.0.tar.gz 210048 BLAKE2B 3589922c610d6a8f32fb753cb91f2c925a2bd4d63dc5b32cc37bb7723b7b6eb7339135cc2dd1629c6aa42684c4fe376dd1364bd928fc8c48100471203b68b627 SHA512 c12725c85ab6836fc6554edc64bc2f005d62e45c3d69d07811138cd09d29635399f70ba5837ead05f5827a327a1666bb4134475c99e2f8da81bd3412e4946a59 diff --git a/dev-libs/tree-sitter-go/tree-sitter-go-0.19.1.ebuild b/dev-libs/tree-sitter-go/tree-sitter-go-0.19.1.ebuild deleted file mode 100644 index 4193e530e8c5..000000000000 --- a/dev-libs/tree-sitter-go/tree-sitter-go-0.19.1.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TS_PV=rust-0.19.1 -inherit tree-sitter-grammar - -DESCRIPTION="Go grammar for Tree-sitter" -HOMEPAGE="https://github.com/tree-sitter/tree-sitter-go" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" diff --git a/dev-libs/tree-sitter-go/tree-sitter-go-0.21.0.ebuild b/dev-libs/tree-sitter-go/tree-sitter-go-0.21.0.ebuild new file mode 100644 index 000000000000..322cb405b4be --- /dev/null +++ b/dev-libs/tree-sitter-go/tree-sitter-go-0.21.0.ebuild @@ -0,0 +1,13 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit tree-sitter-grammar + +DESCRIPTION="Go grammar for Tree-sitter" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter-go" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" diff --git a/dev-libs/tree-sitter-java/Manifest b/dev-libs/tree-sitter-java/Manifest index 3797e2552640..9a93dd4f91c9 100644 --- a/dev-libs/tree-sitter-java/Manifest +++ b/dev-libs/tree-sitter-java/Manifest @@ -1,4 +1,2 @@ -DIST tree-sitter-java-0.19.1.tar.gz 134115 BLAKE2B 92b2388d644659fa84646deeff06cda9c1c3bf3dbf6d06bda8e8dea14c2e748813cbaec440a458f98e0f1182e7543ca6a1d4c30ecbd2ba7733e09acf3aeff623 SHA512 71bd34132785f1b95538ce321eba4d6258fff309abf6150852b749336d7ffa5e4bd06f52fb5b6db2e2845592e6faf2ad4cac226289a0078f06cf2fc2f74152bb -DIST tree-sitter-java-0.20.0.tar.gz 166695 BLAKE2B 6a618894746f113692997ba683fd3185e0f321f82bef3a7a11226a81f28e40b9973f74cc7010035983da1f5a6f2cbc493688c8bac47381fcd1d1010d03d4db5c SHA512 e6a341879e0eb889be7ff26a7f675e8bcb6f85de040f7d09029421b43bf4069a62889fdc7bd6b8e4afabd2b93df1bdfd86853b1cc6c2daf69f84ea68ede217d5 -DIST tree-sitter-java-0.20.1.tar.gz 176841 BLAKE2B eda966d8c648fc0192ab34b6ed8f2b87a6eff4dd05f47d54ec87659f62e497f7793d6949452504102fefe41c38bea4f51051484cd338b8a407030a3f7c888907 SHA512 07179852060198989c980462e2006083440895f37feb29b639d3c8ce8cb6a84a1b826e11d136821d398c34b0f989a23fce2ddf4ef0391b6f1ebb611b3004d1fc DIST tree-sitter-java-0.20.2.tar.gz 200727 BLAKE2B 03c9b805ad94b852fc9e02f1e266cae9010636cd33ffd2a7f3da1076843aced2358f95022476476edd0b201efb87b164f31bdd610654f182cc627fd762c39cb8 SHA512 188b4d4c5aad6367ab25e5bbc3b7f56fe1b6108ee1dbe072d71a7376e52793364fad004e2f79d1aa6e18176d5642afef982a40b8da127d4252f2ea10d4bf874c +DIST tree-sitter-java-0.21.0.tar.gz 218672 BLAKE2B 8138dbfdb76aebd1067be3a6c97543c71d601b3b5475e14b050251e163a0f1fff97003505ef4c3f997b34f588470acd5e46df70e54afead8dc2f80b020cb41a3 SHA512 236159990182f2cab0fd50ab1f43898f021243a37e7517f7c8df039296f08e1fe615889a0fd0677eae3abd6a495333ed56be5164f43855cb9ef8e0cc4f2b70c9 diff --git a/dev-libs/tree-sitter-java/tree-sitter-java-0.19.1.ebuild b/dev-libs/tree-sitter-java/tree-sitter-java-0.19.1.ebuild deleted file mode 100644 index d90c0532fc87..000000000000 --- a/dev-libs/tree-sitter-java/tree-sitter-java-0.19.1.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit tree-sitter-grammar - -DESCRIPTION="Java grammar for Tree-sitter" -HOMEPAGE="https://github.com/tree-sitter/tree-sitter-java" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" diff --git a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.0.ebuild b/dev-libs/tree-sitter-java/tree-sitter-java-0.20.0.ebuild deleted file mode 100644 index 5b79a06f012a..000000000000 --- a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.0.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit tree-sitter-grammar - -DESCRIPTION="Java grammar for Tree-sitter" -HOMEPAGE="https://github.com/tree-sitter/tree-sitter-java" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" diff --git a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.1.ebuild b/dev-libs/tree-sitter-java/tree-sitter-java-0.20.1.ebuild deleted file mode 100644 index 19ac8915ea50..000000000000 --- a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.1.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit tree-sitter-grammar - -DESCRIPTION="Java grammar for Tree-sitter" -HOMEPAGE="https://github.com/tree-sitter/tree-sitter-java" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" diff --git a/dev-libs/tree-sitter-java/tree-sitter-java-0.21.0.ebuild b/dev-libs/tree-sitter-java/tree-sitter-java-0.21.0.ebuild new file mode 100644 index 000000000000..e09c03cd7396 --- /dev/null +++ b/dev-libs/tree-sitter-java/tree-sitter-java-0.21.0.ebuild @@ -0,0 +1,13 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit tree-sitter-grammar + +DESCRIPTION="Java grammar for Tree-sitter" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter-java" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" diff --git a/dev-libs/tree-sitter-javascript/Manifest b/dev-libs/tree-sitter-javascript/Manifest index ac157e77d251..c46994c8c152 100644 --- a/dev-libs/tree-sitter-javascript/Manifest +++ b/dev-libs/tree-sitter-javascript/Manifest @@ -1,4 +1,3 @@ -DIST tree-sitter-javascript-0.20.0.tar.gz 278831 BLAKE2B cd66005e7ebdae154a192ff556d4cb35e91d93a2ab645a24b9492217858278adc1f7917a7dc5033bbcfd84ca7ef41a3e7ebb1ff934bb09b79c8923469110e1de SHA512 778e0f2f5bf276d7ffb6eab0fe3f7473b56605de707c8e2f491fbb5826da94067b9f1bc476306013267001b5ecaab11a956e896b78520cdedd27006fac97fe41 DIST tree-sitter-javascript-0.20.1-2.tar.gz 371027 BLAKE2B 5bd9b11f1e10ff37950b2142031bebd3b5f6111818a21bf5a7d97a8a27a5340bd09cd139d76846141ed64a824f82f1e1394b90d8622192524d7db9a02ed95223 SHA512 5341311b419cf763c0a6d23348eba0e38b417ba07c2def341027223347d850c28b86db6add136dbf73cd5296133823a4548493ee649e09247dfbe5bcbaaab76d -DIST tree-sitter-javascript-0.20.3.tar.gz 394552 BLAKE2B e578299df6645b3529e8b82385a8060a8e25f122faf63f4e7f0ecc6ddbec7f29986c552a83dba9cf0bc8866225e749e3c9c0a5a9556e6266e8e731cf09af4def SHA512 31fd1b645fcbdd6670bc6b00e6c4adc2ce440aa35ba9b530a6161849fd70d0a38f8539727d321ba2bbc60a8d9bcf33296b561f8921115a8e68c50a40b253bbc4 DIST tree-sitter-javascript-0.20.4.tar.gz 396452 BLAKE2B b33c4c44fb59985af7809ef9bd015d12dac185999993570164de4ac87a60cde28cf4c1232a06dd3e312ce256f2b021ef5fa500fd9e0772a3fb657f74256500a4 SHA512 65171e5af35c9c5cc9a6c54792d2194b197e130ec277b35e67e04b654082bcb1b98cb9bbe497bbe1dde69f582e5cdca01cba4f40682b7b587fd19e89b88f3dd6 +DIST tree-sitter-javascript-0.21.0.tar.gz 367344 BLAKE2B 7698b918db7fb49bd73ee03757fa17d5f6c0adc14a279410e2bc924123b1a187e6018b534bc1d2b6cbc41e5f42f7b4b6541c65d4f70d6345dda31c719bf479c6 SHA512 c83d7525e3639e237b9f81cac38d0290a3257aa98dba62f079abfb234f3cbd3de23e0b275da85878d3ab4b8de03384dc4e8a8512641b17ff0aca2e3a722947a6 diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.0.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.0.ebuild deleted file mode 100644 index a082528027b0..000000000000 --- a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.0.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TS_PV=rust-0.20.0 -inherit tree-sitter-grammar - -DESCRIPTION="JavaScript grammar for Tree-sitter" -HOMEPAGE="https://github.com/tree-sitter/tree-sitter-javascript" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.3.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.21.0.ebuild similarity index 100% rename from dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.3.ebuild rename to dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.21.0.ebuild diff --git a/dev-libs/tree-sitter-json/Manifest b/dev-libs/tree-sitter-json/Manifest index 1a24898111fe..fccaf007e65b 100644 --- a/dev-libs/tree-sitter-json/Manifest +++ b/dev-libs/tree-sitter-json/Manifest @@ -1,3 +1,4 @@ DIST tree-sitter-json-0.19.0.tar.gz 11102 BLAKE2B 8530b53dffa59fcc844501dcbfc9fc8a39a4d4fda6653e02b17261c23da43c8f3dd2bcb1e312a58861ea9af7835d4f2b9208e7960bfaec8ffeecd754e04416d0 SHA512 f4ef90d1ff7cb96093e7b54fb0b4904f7c19256c2e0938c03f81d89f3699f0c0922da54d1d770aa786b9cf10b08f9afa762771a207546a29cf7ff7f1710dadb6 DIST tree-sitter-json-0.20.1.tar.gz 15576 BLAKE2B d6b9d3c931453440c2557814184b629640e4a0dd9b763ba8aec51aeb8322b021d0bfd8e4385445ef527100f67db507d3c934480457a7a5ed60a2d035fda44f13 SHA512 30ae91cec4c9e63acfd2bd0c62b313d48a50ec722ff5c793b8b51910a02a9c6f8697a866ec7bbde3c7f14b2bdcfc12be3650d7a8e6f23fde80527cc235a3768e DIST tree-sitter-json-0.20.2.tar.gz 15647 BLAKE2B 524933bf7af4df87d78497912c7865c20b2cc3e9b099401aac612c8c6d382fbc8f8704515abcb1e579fbac7734d23545f91ac7600e978a2924567998e5166834 SHA512 511376b7be02c624bc48b0a46dd937f1a5d6def3d2a15a7b61cf71b846ecf98ef8af93f05f861152270ea0dcacc18940f8c25bfbad69e9d5c520485d25dab7f5 +DIST tree-sitter-json-0.21.0.tar.gz 34737 BLAKE2B 104229cd039b41fb79ccdab3b30e0e59a96a3aa46c060bf50cc093acfe4510150ad5caaf39f49045d478d9f67f863ff6289ba7ab59aaa27871ebb77ffc66a453 SHA512 37ee6a511e15eeb832c7a49d74d977724fecfe24943472047e2100aa18bf4e64f297b1a8e8e37f1d2223614dd9ceec038abd84b5f1fcc00bb67289b70de2ebd2 diff --git a/dev-libs/tree-sitter-json/tree-sitter-json-0.21.0.ebuild b/dev-libs/tree-sitter-json/tree-sitter-json-0.21.0.ebuild new file mode 100644 index 000000000000..6b747e802705 --- /dev/null +++ b/dev-libs/tree-sitter-json/tree-sitter-json-0.21.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TS_BINDINGS=( python ) + +inherit tree-sitter-grammar + +DESCRIPTION="JSON grammar for Tree-sitter" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter-json" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" diff --git a/dev-libs/tree-sitter-rust/Manifest b/dev-libs/tree-sitter-rust/Manifest index 7e7b8de3678d..1d093443cfba 100644 --- a/dev-libs/tree-sitter-rust/Manifest +++ b/dev-libs/tree-sitter-rust/Manifest @@ -1,3 +1,4 @@ DIST tree-sitter-rust-0.20.1.tar.gz 308918 BLAKE2B b226bf6eb2c282f62d3eef0598db38dc54d03ed2ea07313fffbb6c9d955cccc71bef5513b8b2c56460989789e9f4293fb27a2db152b5afa56085348427fe9ad5 SHA512 de799d76dbcbc7f68ab8560f747c3df3950dd3e640ac60cd44d65a60b23e118e271370e2b1b84d2d830c2d70341b5714f5f52592709ba15f6b164c05f3798f07 DIST tree-sitter-rust-0.20.3.tar.gz 325621 BLAKE2B b5d2f15df3550e22e380c26a3fa6270a897f4555efb2778e54ef9262145ca919bf933ee739674e02a2086f58d707174c3a2cfb545d879a2c67decf508793af47 SHA512 9732a6e9782538c1a7f7a265e185aece659e164284eac61f65f3d174845aafc697ec2758d6dddb52c8a6ee3856be67493339d680f963ee383894f1d3789d96d5 DIST tree-sitter-rust-0.20.4.tar.gz 358924 BLAKE2B 16c7918d352163ebb866f34865c68f5d9e19bbc3ffcec0f0c61ba38a8c828cee3eb50c97ddaea01d7575e23496bca18dc5161daee8bbdaa075ba75de608be999 SHA512 f1b2e9537286921056eda4e96faa9f61131b9ca5684e7ab8aa7bd07e46d91e5eab18e6e292cfad7cdcb7ba195e80f7f1e35f04992cb8011bbd29dd2d95116f9d +DIST tree-sitter-rust-0.21.0.tar.gz 448170 BLAKE2B ecf13ff1358a64383feaa973332be7ff7d7551c414fef9bb3773f1ca975db97f6e0e6076ea572094771c25c59641a58aeec70c41fea65533b59fc436fd143938 SHA512 f9cd32e43b544a18eddfc0b6f8210f1fbc3e7a5d6e9b72c482a536df1e215ceadb41545a65f0c6fc791f6063adbe51957d4e20f7c8fa07a5079a4338a0351bf3 diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.0.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.0.ebuild new file mode 100644 index 000000000000..9eda069afc34 --- /dev/null +++ b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TS_BINDINGS=( python ) + +inherit tree-sitter-grammar + +DESCRIPTION="Rust grammar for Tree-sitter" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest index 693a9f4a608a..5cf69b64952b 100644 --- a/dev-libs/tree-sitter/Manifest +++ b/dev-libs/tree-sitter/Manifest @@ -1,4 +1,4 @@ -DIST tree-sitter-0.20.8.tar.gz 2941223 BLAKE2B 158820a88b20cc96252f8bfdd257e910ca4dc79174bb45ee52623c923b8a634714c65be8f9534411865fb03aaf84bf16bf659567a74cd58141ea687fa89601e5 SHA512 30fa3f97e1a24d469a7565dc91db629accdfbe081b43d951e9751059a0c7f763d727e95efce5806cd9b1689650773bee1106f4f91ba001da57df3b0d83dda967 DIST tree-sitter-0.20.9.tar.gz 3041304 BLAKE2B a6cf6606f75918eeab7dab0d2758cdba0922b5677cd4c8755982c077ee0a734090c8a87f7dd1fd56525b5864f94f5f19c3fd04e43773877e13968855f976d0c0 SHA512 6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a DIST tree-sitter-0.22.1.tar.gz 3038644 BLAKE2B f4a2cae41e6ec327c8a77380fcf531b00a4fcd75997872c73371886379f35e31431da1e175e41b3c6bee9fdad46015d29bec93a103ea1ff36a1d365dc9a04d40 SHA512 fa2656ad3a6d52301b497512aecc87b8c50ab6646aaac4730a26249ed0878e4542e2d256e42e0179ebc06147f772a2cf38f9362bb94ea1a8f0ec8c21e06e75e7 DIST tree-sitter-0.22.2.tar.gz 3040339 BLAKE2B c18a79b4fdf553c50b4dd4c67c92d02fd341c5266c4658eb226d9ea455f23d2d22fe4ed4ca48811da2c8a59c403d8eff53dd9257468df7a9cfa640652c485c95 SHA512 a42d744f6e1db7c7c842804f3435b87ccb5d0df2363a18eee38353f12f18c8cf0c6211bf0225fd5f2c0431ca8531aa4ddd73d87d42b80fa35c3c701cae2d7856 +DIST tree-sitter-0.22.4.tar.gz 3034955 BLAKE2B 797feb6e2171b0e00b10c67c8b6dcda6cc2ec420ef797991a642524982629496e4b7bcae92a2658ba3adffea75332bcda09ecbced01e73e13ba6f4c39d15e9ea SHA512 7f160e88cdffb47f4ee3f884385ec759fcf88883307221ddadd8bf561d1dfb3659b0c7f4b216286066cf912183cc8234788492d62d1f1ad14fcb39bd3287cf36 diff --git a/dev-libs/tree-sitter/files/tree-sitter-0.20.8-no-parser-header.patch b/dev-libs/tree-sitter/files/tree-sitter-0.20.8-no-parser-header.patch deleted file mode 100644 index 1e055a69e00d..000000000000 --- a/dev-libs/tree-sitter/files/tree-sitter-0.20.8-no-parser-header.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://github.com/tree-sitter/tree-sitter-bash/issues/199 -https://github.com/tree-sitter/tree-sitter/pull/2573 -https://github.com/tree-sitter/tree-sitter/pull/2574 - -From 05b18c2cda9b391efffb4986bf46fa56333d801b Mon Sep 17 00:00:00 2001 -From: Andrew Hlynskyi -Date: Sat, 26 Aug 2023 20:50:23 +0300 -Subject: [PATCH] fix: makefile should install only header - ---- a/Makefile -+++ b/Makefile -@@ -57,7 +57,7 @@ install: all - ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR) - ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT) - install -d '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter -- install -m644 lib/include/tree_sitter/*.h '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/ -+ install -m644 lib/include/tree_sitter/api.h '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/ - install -d '$(DESTDIR)$(PCLIBDIR)' - sed -e 's|@LIBDIR@|$(LIBDIR)|;s|@INCLUDEDIR@|$(INCLUDEDIR)|;s|@VERSION@|$(VERSION)|' \ - -e 's|=$(PREFIX)|=$${prefix}|' \ --- -2.42.0 - diff --git a/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch b/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch deleted file mode 100644 index dd898b059612..000000000000 --- a/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/Makefile b/Makefile -index 764f411a..86aaefd8 100644 ---- a/Makefile -+++ b/Makefile -@@ -41,7 +41,7 @@ ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly)) - PCLIBDIR := $(PREFIX)/libdata/pkgconfig - endif - --all: libtree-sitter.a libtree-sitter.$(SOEXTVER) -+all: libtree-sitter.$(SOEXTVER) - - libtree-sitter.a: $(OBJ) - $(AR) rcs $@ $^ -@@ -53,7 +53,6 @@ libtree-sitter.$(SOEXTVER): $(OBJ) - - install: all - install -d '$(DESTDIR)$(LIBDIR)' -- install -m755 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/libtree-sitter.a - install -m755 libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER) - ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR) - ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT) diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild deleted file mode 100644 index d521078d2bfc..000000000000 --- a/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit optfeature toolchain-funcs - -DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library" -HOMEPAGE="https://github.com/tree-sitter/tree-sitter" - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}/${PN}" -else - SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" -fi - -LICENSE="MIT" -SLOT="0" - -PATCHES=( - "${FILESDIR}/${PN}-No-static-libs-gentoo.patch" - "${FILESDIR}/${PN}-0.20.8-no-parser-header.patch" -) - -# XXX: Please, don't forget to check this on next version bump. -# And, maybe remove as non-needed, if version in Makefile will -# match the release. -# ref: https://github.com/tree-sitter/tree-sitter/issues/2210 -# see Makefile:1 -QA_PKGCONFIG_VERSION="0.20.9" - -src_prepare() { - default - tc-export CC -} - -src_compile() { - emake \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" -} - -src_install() { - emake DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - install -} - -pkg_postinst() { - optfeature "building and testing grammars" dev-util/tree-sitter-cli -} diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild deleted file mode 100644 index f44668ee69e9..000000000000 --- a/dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit optfeature toolchain-funcs - -DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library" -HOMEPAGE="https://github.com/tree-sitter/tree-sitter" - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}/${PN}" -else - SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" -fi - -LICENSE="MIT" -SLOT="0" - -PATCHES=( "${FILESDIR}/${PN}-No-static-libs-gentoo.patch" ) - -# see Makefile:1 -QA_PKGCONFIG_VERSION="0.20.9" - -# XXX: Please, don't forget to check this on next version bump. -# And, maybe remove as non-needed, if version in Makefile will -# match the release. -# ref: https://github.com/tree-sitter/tree-sitter/issues/2210 - -src_prepare() { - default - tc-export CC -} - -src_compile() { - emake \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" -} - -src_install() { - emake DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - install -} - -pkg_postinst() { - optfeature "building and testing grammars" dev-util/tree-sitter-cli -} diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.9-r1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.9-r1.ebuild index 8d5a0cb48ed3..3c51e4f49aed 100644 --- a/dev-libs/tree-sitter/tree-sitter-0.20.9-r1.ebuild +++ b/dev-libs/tree-sitter/tree-sitter-0.20.9-r1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/${PN}/${PN}" else SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" fi LICENSE="MIT" diff --git a/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild index d3fc3901eeef..e4472d74116c 100644 --- a/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild +++ b/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/${PN}/${PN}" else SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos" fi LICENSE="MIT" diff --git a/dev-libs/tree-sitter/tree-sitter-0.22.4.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.4.ebuild new file mode 100644 index 000000000000..db60d1726316 --- /dev/null +++ b/dev-libs/tree-sitter/tree-sitter-0.22.4.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit optfeature toolchain-funcs + +DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/${PN}" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +fi + +LICENSE="MIT" +SLOT="0" +RESTRICT="test" # tests are for CLI and not the lib + +PATCHES=( + "${FILESDIR}/${PN}-0.22.2-no-static.patch" +) + +src_prepare() { + default + tc-export CC +} + +src_compile() { + emake \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + STRIP="" # bug 930020 +} + +src_install() { + emake DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + install +} + +pkg_postinst() { + optfeature "building and testing grammars" dev-util/tree-sitter-cli +} diff --git a/dev-libs/tree-sitter/tree-sitter-9999.ebuild b/dev-libs/tree-sitter/tree-sitter-9999.ebuild index 1725e8da5f49..db60d1726316 100644 --- a/dev-libs/tree-sitter/tree-sitter-9999.ebuild +++ b/dev-libs/tree-sitter/tree-sitter-9999.ebuild @@ -17,9 +17,10 @@ fi LICENSE="MIT" SLOT="0" +RESTRICT="test" # tests are for CLI and not the lib PATCHES=( - "${FILESDIR}/${PN}-0.20.9-no-static.patch" + "${FILESDIR}/${PN}-0.22.2-no-static.patch" ) src_prepare() { @@ -30,7 +31,8 @@ src_prepare() { src_compile() { emake \ PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + STRIP="" # bug 930020 } src_install() { diff --git a/dev-libs/yascreen/Manifest b/dev-libs/yascreen/Manifest deleted file mode 100644 index 1c4276397e24..000000000000 --- a/dev-libs/yascreen/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST yascreen-1.86.tar.xz 26104 BLAKE2B 4716c1eb2a41468fbb0ecbcda7c34a031d97f5292632501ce4c9740de071f8c39e1c7d9f0f8f6c5fbdccaef5908e3751b25ebc7e0c6dab3dff63b2a99f12eefa SHA512 dce785c477395b0c78c5054682dd8ccfbe3243ede966300c3e95e25fac6320f820aa1f0a3b2ce37544b3b45adb94eccccaf32187b145cd2bba43367e166b9e7c -DIST yascreen-1.92.tar.xz 27624 BLAKE2B 8450d2f3d7f35b0bfa994869d71343f7c4e7c78ad5e73bbfb5c2a9a7ef1ba67deed469720b3aed8af5f841b65ea8c17456866bb9c98d6750957a74800e245e34 SHA512 f884e6ad9a0cd3410323bd0bf544f006e719a021a6a04063d6f0712d73893579098f7d00c91b8d85dadff8f9136389e0f7b5831a2b52595ef6a7f1dbb30d5244 diff --git a/dev-libs/yascreen/files/yascreen-1.86-fix-install.patch b/dev-libs/yascreen/files/yascreen-1.86-fix-install.patch deleted file mode 100644 index 0e584bb0ece9..000000000000 --- a/dev-libs/yascreen/files/yascreen-1.86-fix-install.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Boian Bonev -Date: Tue, 21 Sep 2021 03:36:23 +0300 -Subject: [PATCH] fix problems with install - ---- a/Makefile.main -+++ b/Makefile.main -@@ -108,12 +108,12 @@ yascreen.pc: yascreen.pc.in - - install: libyascreen.a libyascreen.so yascreen.pc yascreen.3 - $(INSTALL) -Ds -m 644 -t $(DESTDIR)$(PREFIX)$(LIBDIR) libyascreen.a -- $(INSTALL) -Ds -m 644 -t $(DESTDIR)$(PREFIX)$(LIBDIR)/pkgconfig/ yascreen.pc -+ $(INSTALL) -D -m 644 -t $(DESTDIR)$(PREFIX)$(LIBDIR)/pkgconfig/ yascreen.pc - ln -fs libyascreen.so.$(SOVERF) $(DESTDIR)$(PREFIX)$(LIBDIR)libyascreen.so.$(SOVERM) - ln -fs libyascreen.so.$(SOVERM) $(DESTDIR)$(PREFIX)$(LIBDIR)libyascreen.so - $(INSTALL) -Ds -m 644 -s -t $(DESTDIR)$(PREFIX)$(LIBDIR) libyascreen.so.$(SOVERF) -- $(INSTALL) -Ds -m 644 -t $(DESTDIR)$(PREFIX)$(INCDIR) yascreen.h -- $(INSTALL) -TDs -m 0644 yascreen.3 $(DESTDIR)$(PREFIX)/share/man/man3/yascreen.3 -+ $(INSTALL) -D -m 644 -t $(DESTDIR)$(PREFIX)$(INCDIR) yascreen.h -+ $(INSTALL) -TD -m 0644 yascreen.3 $(DESTDIR)$(PREFIX)/share/man/man3/yascreen.3 - - clean: - rm -f yastest yastest.shared yastest.o yascreen.o libyascreen.a libyascreen.so libyascreen.so.$(SOVERM) libyascreen.so.$(SOVERF) yascreen.pc diff --git a/dev-libs/yascreen/metadata.xml b/dev-libs/yascreen/metadata.xml deleted file mode 100644 index a08688b11e34..000000000000 --- a/dev-libs/yascreen/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - arthurzam@gentoo.org - Arthur Zamarin - - - bbonev/yascreen - - diff --git a/dev-libs/yascreen/yascreen-1.86-r1.ebuild b/dev-libs/yascreen/yascreen-1.86-r1.ebuild deleted file mode 100644 index 6ce556efe3ab..000000000000 --- a/dev-libs/yascreen/yascreen-1.86-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Yet Another Screen Library - curses replacement" -HOMEPAGE="https://github.com/bbonev/yascreen" -SRC_URI="https://github.com/bbonev/yascreen/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -PATCHES=( - "${FILESDIR}/${P}-fix-install.patch" -) - -src_prepare() { - default - sed -e '/INSTALL/s/-Ds/-D/' \ - -e '/INSTALL/s/-s//' \ - -e "s:/usr/local:${EPREFIX}/usr:" \ - -e "s:/lib/:/$(get_libdir)/:" \ - -i Makefile.main || die -} - -src_compile() { - emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" NO_FLTO=1 -} - -src_install() { - default - find "${D}" -name '*.a' -delete || die -} diff --git a/dev-libs/yascreen/yascreen-1.92.ebuild b/dev-libs/yascreen/yascreen-1.92.ebuild deleted file mode 100644 index 8435b7154827..000000000000 --- a/dev-libs/yascreen/yascreen-1.92.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Yet Another Screen Library - curses replacement" -HOMEPAGE="https://github.com/bbonev/yascreen" -SRC_URI="https://github.com/bbonev/yascreen/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="LGPL-3+" -SLOT="0/1" -KEYWORDS="~amd64 ~x86" - -src_prepare() { - default - sed -e '/INSTALL/s/-Ds/-D/' \ - -e '/INSTALL.*libyascreen.a/d' -e 's/libyascreen.a//' -i Makefile.main || die - grep -q -F "SOVERM:=1" Makefile.main || die "subslot changed" -} - -src_compile() { - emake CC="$(tc-getCC)" PREFIX="${EPREFIX}/usr" LIBDIR="/$(get_libdir)/" NO_FLTO=1 -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="/$(get_libdir)/" install - einstalldocs -} diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz index 77de23779655..3eb81740bd9b 100644 Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ diff --git a/dev-perl/Sys-Virt/Manifest b/dev-perl/Sys-Virt/Manifest index a2e92c1d359a..0155453310ec 100644 --- a/dev-perl/Sys-Virt/Manifest +++ b/dev-perl/Sys-Virt/Manifest @@ -1,2 +1,3 @@ DIST Sys-Virt-v10.1.0.tar.gz 175345 BLAKE2B 19f5620f546b1ea0f6dda0126b56735102f7513b9c41b86e1892f846a84fdfac0f1296a4d1238c7f1cc5c1e5704d5fb8f8dc81cc3961ca59acca5403fa580701 SHA512 6b20573e953bd99e547da683cfc587dd132f8b7921ae76289aad9891179b7d068c96a0c67f90b6daa7c5bf0156de02b3a85f7ec538ee47ca4f81547f03256003 +DIST Sys-Virt-v10.2.0.tar.gz 175575 BLAKE2B 2950f991be8ae130788b1b03c1f898fb778b67765aa93732540a1fe5057a66e7a4efb7c7792327b81816281d7ba910466b24a50ec36165e554f1cb481693fba4 SHA512 c362e37511aff879b08a67b6337cee6d20c197fea2bb7f6ce023eafa642f53029744d704250533772fd48448ff39ea49027b83563cd9821dcd22d3621b2372ef DIST Sys-Virt-v9.7.0.tar.gz 174737 BLAKE2B 676be20e39102f92b9b1d3cc703479c67f43d7007f01f9cfb725d13002ba0abdb3123ac756ace666ffd3c67224943281ad79b840c50afbfd4e8f7f9c5ca4be27 SHA512 211cc36536ec8538e096d36bca568b0362a2c84fe78322acb34a473a91128f46251503db14e38b63cd865a2f16b5c021e6e75ec1832368ae26480bb7e32180d4 diff --git a/dev-perl/Sys-Virt/Sys-Virt-10.2.0.ebuild b/dev-perl/Sys-Virt/Sys-Virt-10.2.0.ebuild new file mode 100644 index 000000000000..16cad8c07a60 --- /dev/null +++ b/dev-perl/Sys-Virt/Sys-Virt-10.2.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Packages which get releases together: +# app-emacs/nxml-libvirt-schemas +# dev-python/libvirt-python +# dev-perl/Sys-Virt +# app-emulation/libvirt +# Please bump them together! + +DIST_AUTHOR=DANBERR +DIST_VERSION=v${PV} +DIST_EXAMPLES=("examples/*") +inherit perl-module + +DESCRIPTION="API for using the libvirt library from Perl" + +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" + +RDEPEND=" + >=app-emulation/libvirt-${PV} +" +BDEPEND="${RDEPEND} + virtual/perl-ExtUtils-CBuilder + dev-perl/Module-Build + virtual/pkgconfig + test? ( + dev-perl/CPAN-Changes + dev-perl/Test-More-UTF8 + dev-perl/Test-Pod-Coverage + dev-perl/XML-XPath + virtual/perl-Test-Simple + virtual/perl-Time-HiRes + )" +DEPEND=" + >=app-emulation/libvirt-${PV} +" diff --git a/dev-python/Faker/Faker-24.2.0.ebuild b/dev-python/Faker/Faker-24.2.0.ebuild deleted file mode 100644 index 95ff3728fb55..000000000000 --- a/dev-python/Faker/Faker-24.2.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( pypy3 python3_{10..12} ) - -inherit distutils-r1 pypi - -DESCRIPTION="A Python package that generates fake data for you" -HOMEPAGE=" - https://github.com/joke2k/faker/ - https://pypi.org/project/Faker/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - >=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}] - !dev-ruby/faker -" -BDEPEND=" - test? ( - dev-python/freezegun[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP},tiff] - dev-python/validators[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin - epytest -} diff --git a/dev-python/Faker/Faker-24.4.0.ebuild b/dev-python/Faker/Faker-24.4.0.ebuild index 4a85c701f3c8..95ff3728fb55 100644 --- a/dev-python/Faker/Faker-24.4.0.ebuild +++ b/dev-python/Faker/Faker-24.4.0.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" RDEPEND=" >=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}] diff --git a/dev-python/Faker/Faker-24.9.0.ebuild b/dev-python/Faker/Faker-24.9.0.ebuild new file mode 100644 index 000000000000..4a85c701f3c8 --- /dev/null +++ b/dev-python/Faker/Faker-24.9.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +PYTHON_COMPAT=( pypy3 python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="A Python package that generates fake data for you" +HOMEPAGE=" + https://github.com/joke2k/faker/ + https://pypi.org/project/Faker/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +RDEPEND=" + >=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}] + !dev-ruby/faker +" +BDEPEND=" + test? ( + dev-python/freezegun[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP},tiff] + dev-python/validators[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +python_test() { + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin + epytest +} diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest index 68a6b60fd2cc..068670fb5187 100644 --- a/dev-python/Faker/Manifest +++ b/dev-python/Faker/Manifest @@ -1,3 +1,3 @@ -DIST Faker-24.2.0.tar.gz 1723713 BLAKE2B 75ea69214239084a59284a95a1cb2585671aa770fd78f853030ae7cb32281370e7505ba05262958d3511ea131ebab6ef1175953be6f73a048160eaa8536a6364 SHA512 85b5acf252f6163cdd87b8f8269360e6e204899f1645ed0f50302719ad0386e1c1fd766904cb239222c1d6120429f33a69deaf3d331743685333e35e12790a43 DIST Faker-24.4.0.tar.gz 1724351 BLAKE2B 2eeb2d660462b0f0b55aadd32768c9a5eaaf22a8036ae203dab7538b8c24f0e6fcdf08533c7737fe597dbe395a00a39c8c2d5e3a823133638a90a9ffa8d32f08 SHA512 5ea18faa39cf8506f007557b9a8c84bf2cc21d806a99991bf2fcced3d350f96daf3dd6a0a42dfdb7021b72156eb12ad84a930c669df011f39a17f4c290d08675 DIST Faker-24.8.0.tar.gz 1725365 BLAKE2B b2646766b993d946bf7965133b7484408370a2e8bed9091b713ffd427d545bb708027066b6787a78cd675659b4d342ac86c9f611aecfb7df3d0565a8066925f0 SHA512 d8fe7e411052bec485b40540317c88ff5aeae8a32ef2e53214816b190d4730c9f5af9157ac2c66aba5fbc887e995d0238f71deefdcf67300e49586c7995b60ff +DIST Faker-24.9.0.tar.gz 1725521 BLAKE2B 30486824e1e9a33cb9bf018ebbe9845c65c5fbb797fd75c0798f854c487b5e02b30fad83dd1f94ef4650e5e6ec981ef3318e1b3ec7cc64169e2b3fb7f90a42d8 SHA512 18fb6970c90c1048fcfcc9bb3f557eb21374b9e0f128833ac32ad281019059d8a8a3a05a276b72d38bd9bd6315cf0846d7f8111f054191dae1149cdcaf08187d diff --git a/dev-python/IPy/IPy-1.01-r1.ebuild b/dev-python/IPy/IPy-1.01-r1.ebuild index f03cdaf62f4a..c2987fa5b72a 100644 --- a/dev-python/IPy/IPy-1.01-r1.ebuild +++ b/dev-python/IPy/IPy-1.01-r1.ebuild @@ -1,11 +1,12 @@ -# 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 PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{9..11} ) + +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 pypi diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index 73f27d73e734..487c206a6788 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/OutputCheck/OutputCheck-0.4.2-r1.ebuild b/dev-python/OutputCheck/OutputCheck-0.4.2-r1.ebuild deleted file mode 100644 index 814333b341ff..000000000000 --- a/dev-python/OutputCheck/OutputCheck-0.4.2-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 - -DESCRIPTION="A tool for checking the output of console programs inspired by LLVM's FileCheck" -HOMEPAGE="https://github.com/stp/OutputCheck/" -SRC_URI="https://github.com/stp/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND="test? ( dev-python/lit[${PYTHON_USEDEP}] )" - -PATCHES=( "${FILESDIR}"/${P}-Driver.patch ) - -src_prepare() { - distutils-r1_src_prepare - - # Remove bad tests. - rm "${S}"/tests/invalid-regex-syntax.smt2 || - die "failed to remove bad tests" - - # Create RELEASE-VERSION file. - echo ${PV} > "${S}"/RELEASE-VERSION || - die "failed to write RELEASE-VERSION" -} - -python_test() { - lit --verbose "${S}"/tests || die "running test with ${EPYTHON} failed" -} diff --git a/dev-python/OutputCheck/OutputCheck-0.4.2-r2.ebuild b/dev-python/OutputCheck/OutputCheck-0.4.2-r2.ebuild new file mode 100644 index 000000000000..01ac4eea4db6 --- /dev/null +++ b/dev-python/OutputCheck/OutputCheck-0.4.2-r2.ebuild @@ -0,0 +1,38 @@ +# 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..12} ) + +inherit distutils-r1 + +DESCRIPTION="A tool for checking the output of console programs inspired by LLVM's FileCheck" +HOMEPAGE="https://github.com/stp/OutputCheck/" +SRC_URI="https://github.com/stp/${PN}/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( dev-python/lit[${PYTHON_USEDEP}] )" + +PATCHES=( "${FILESDIR}/${PN}-0.4.2-Driver.patch" ) + +src_prepare() { + distutils-r1_src_prepare + + # Remove bad tests. + rm "${S}/tests/invalid-regex-syntax.smt2" || die "failed to remove bad tests" + + # Create RELEASE-VERSION file. + echo "${PV}" > "${S}/RELEASE-VERSION" || die "failed to write RELEASE-VERSION" +} + +python_test() { + lit --verbose "${S}/tests" || die "running test with ${EPYTHON} failed" +} diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest index 5af8b49f87e6..c597c0851392 100644 --- a/dev-python/PyGithub/Manifest +++ b/dev-python/PyGithub/Manifest @@ -1,2 +1 @@ -DIST PyGithub-2.2.0.tar.gz 3439222 BLAKE2B 4211786a258d1a9ed5202f495085a9c32b41b8d60ce567d8d7cdfab593acbc533aa34ed82afd1f65490efaeef2a4afc5dcf31ed95b3c382e4e488bc2495f7f79 SHA512 58431e0d696c4e9fa7311850711f16ab2feec28fb93acf31d0d204702e853f47ffa483b8b0b9bec9fba0eb98c714d85c9ebd3b98f87195e97fc2dbd6525024da DIST PyGithub-2.3.0.tar.gz 3455482 BLAKE2B 3638d5a101dcc41196a54f1a1e36dbc2dd53ab21fc2edd1945a036527979939da53dbf1cdd462622e851e891eae1264231b42c9f8a561740087d602a966d11b2 SHA512 7964b8ab1ad989e48b7d4cda42e7690cdd99c7f8d199e0eaa5ff5b2986592cef135e252253bef4f425cf04946ea18d8c83bcce4253914113fc9a21e83dc31166 diff --git a/dev-python/PyGithub/PyGithub-2.2.0.ebuild b/dev-python/PyGithub/PyGithub-2.2.0.ebuild deleted file mode 100644 index 831cab7e7c76..000000000000 --- a/dev-python/PyGithub/PyGithub-2.2.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Python library to access the Github API v3" -HOMEPAGE=" - https://github.com/PyGithub/PyGithub/ - https://pypi.org/project/PyGithub/ -" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="amd64 arm64 x86" - -# cryptography via pyjwt[crypto] -RDEPEND=" - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/deprecated[${PYTHON_USEDEP}] - >=dev-python/pyjwt-2.4.0[${PYTHON_USEDEP}] - >=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}] - >=dev-python/requests-2.14.0[${PYTHON_USEDEP}] - >=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/setuptools-scm[${PYTHON_USEDEP}] - test? ( - >=dev-python/httpretty-1.0.3[${PYTHON_USEDEP}] - >=dev-python/pytest-subtests-0.11.0[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest diff --git a/dev-python/PyGithub/PyGithub-2.3.0.ebuild b/dev-python/PyGithub/PyGithub-2.3.0.ebuild index 61d3148c22b2..831cab7e7c76 100644 --- a/dev-python/PyGithub/PyGithub-2.3.0.ebuild +++ b/dev-python/PyGithub/PyGithub-2.3.0.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 x86" # cryptography via pyjwt[crypto] RDEPEND=" diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r2.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r2.ebuild index e3959e15dcab..6cdf17e81365 100644 --- a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r2.ebuild +++ b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r2.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,10,11} ) +PYTHON_COMPAT=( python3_{9,10,11,12} ) inherit distutils-r1 diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild index b9f9a8493b93..3b66370dac42 100644 --- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild +++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-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 @@ -34,13 +34,20 @@ BDEPEND=" distutils_enable_tests pytest -PATCHES=( - # https://github.com/aio-libs/aiohttp-cors/pull/278 - "${FILESDIR}/${P}-tests.patch" - "${FILESDIR}/${P}-py3_7.patch" - # https://github.com/aio-libs/aiohttp-cors/pull/412 - "${FILESDIR}/${P}-py3_11.patch" -) +src_prepare() { + local PATCHES=( + # https://github.com/aio-libs/aiohttp-cors/pull/278 + "${FILESDIR}/${P}-tests.patch" + "${FILESDIR}/${P}-py3_7.patch" + # https://github.com/aio-libs/aiohttp-cors/pull/412 + "${FILESDIR}/${P}-py3_11.patch" + ) + + # doesn't do anything, except for breaking pytest-8 + rm conftest.py || die + + distutils-r1_src_prepare +} python_test() { local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest index a4b8b3ee4094..792e71ab48ef 100644 --- a/dev-python/aiohttp/Manifest +++ b/dev-python/aiohttp/Manifest @@ -1 +1,2 @@ DIST aiohttp-3.9.3.tar.gz 7499669 BLAKE2B 0712df73af60cc9cbf12f0a4e063b6aa6da1b19b0668effe16672a4b7ca3f24cc831218ec8d4672cd86acd4335a75e16f94133dbb1bf783baf8ed96e471f3eec SHA512 6236f27b6def0c3bba1b5fc59f4af74f8076aa369cf5c1b9bd9ff9dee1c71ee49387ded812875da9450130e92d2091fd01f0608b25b03ff37e99162b89120fd7 +DIST aiohttp-3.9.4.tar.gz 7500720 BLAKE2B 1f41e481590425c16ef9e797ecc78e08d00fda65b40c38e34226ada969f3114cae3f6953980d23b0e96e284f6e49fd0a84aa93c6b7a666d60690e9a9fd9c41b2 SHA512 e26e7148602d72c77fe46e0596614b448f38a9014834a72c4131d8b315dbbd401ce4e1a403ef35ea7a9ba7fafaddc42031d38b93b45464accdedf26ba99fc960 diff --git a/dev-python/aiohttp/aiohttp-3.9.4.ebuild b/dev-python/aiohttp/aiohttp-3.9.4.ebuild new file mode 100644 index 000000000000..a4d57535e7e2 --- /dev/null +++ b/dev-python/aiohttp/aiohttp-3.9.4.ebuild @@ -0,0 +1,111 @@ +# 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} pypy3 ) + +inherit distutils-r1 pypi + +DESCRIPTION="HTTP client/server for asyncio" +HOMEPAGE=" + https://github.com/aio-libs/aiohttp/ + https://pypi.org/project/aiohttp/ +" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="test-rust" + +RDEPEND=" + >=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}] + >=dev-python/attrs-17.3.0[${PYTHON_USEDEP}] + dev-python/brotlicffi[${PYTHON_USEDEP}] + >=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}] + >=dev-python/multidict-4.5.0[${PYTHON_USEDEP}] + >=dev-python/yarl-1.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + =dev-python/async-timeout-4.0[${PYTHON_USEDEP}] + ' 3.10) +" +BDEPEND=" + dev-python/cython[${PYTHON_USEDEP}] + test? ( + dev-python/freezegun[${PYTHON_USEDEP}] + www-servers/gunicorn[${PYTHON_USEDEP}] + dev-python/pytest-forked[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/re-assert[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/time-machine[${PYTHON_USEDEP}] + ' 'python3*') + test-rust? ( + dev-python/trustme[${PYTHON_USEDEP}] + ) + ) +" + +DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst ) + +EPYTEST_XDIST=1 +distutils_enable_tests pytest + +src_prepare() { + # increase the timeout a little + sed -e '/abs=/s/0.001/0.01/' -i tests/test_helpers.py || die + # xfail_strict fails on py3.10 + sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die + sed -i -e 's:-Werror::' Makefile || die + + distutils-r1_src_prepare +} + +python_configure_all() { + # workaround missing files + mkdir tools || die + > requirements/cython.txt || die + > tools/gen.py || die + chmod +x tools/gen.py || die + # force rehashing first + emake requirements/.hash/cython.txt.hash + > .update-pip || die + > .install-cython || die + emake cythonize +} + +python_test() { + local EPYTEST_IGNORE=( + # proxy is not packaged + tests/test_proxy_functional.py + # python_on_whales is not packaged + tests/autobahn/test_autobahn.py + ) + + local EPYTEST_DESELECT=( + # Internet + tests/test_client_session.py::test_client_session_timeout_zero + # broken by irrelevant deprecation warnings + tests/test_circular_imports.py::test_no_warnings + # TODO + tests/test_client_session.py::test_request_tracing_url_params + ) + + case ${EPYTHON} in + pypy3) + # upstream unconditionally blocks building C extensions + # on PyPy3 but the test suite needs an explicit switch, + # sigh + local -x AIOHTTP_NO_EXTENSIONS=1 + ;; + esac + + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin,pytest_forked + rm -rf aiohttp || die + epytest --forked -m "not internal and not dev_mode" +} diff --git a/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.1.ebuild b/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.1.ebuild index 31dcc7c87016..495831c62f21 100644 --- a/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.1.ebuild +++ b/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-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 @@ -25,6 +25,13 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" +src_prepare() { + # https://github.com/antlr/antlr4/pull/4593 + sed -i -e 's:assertEquals:assertEqual:' tests/TestIntervalSet.py || die + + distutils-r1_src_prepare +} + python_test() { "${EPYTHON}" tests/run.py -v || die "Tests failed with ${EPYTHON}" } diff --git a/dev-python/antlr4-python3-runtime/metadata.xml b/dev-python/antlr4-python3-runtime/metadata.xml index 542c7a870d6e..82064b3356c6 100644 --- a/dev-python/antlr4-python3-runtime/metadata.xml +++ b/dev-python/antlr4-python3-runtime/metadata.xml @@ -1,10 +1,6 @@ - - java@gentoo.org - Java - python@gentoo.org Python diff --git a/dev-python/anyqt/Manifest b/dev-python/anyqt/Manifest deleted file mode 100644 index 69cdd1f94bb0..000000000000 --- a/dev-python/anyqt/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST anyqt-0.2.0.gh.tar.gz 57920 BLAKE2B b8fcf98706a2f1e8a0553044223fb5b46f471ca4a91436e828507d031c39d20cb4f3f9d556785d0614cc43b02b3134990606f51e002e238674144d9b94ca8528 SHA512 78162ca2758c1fee83b357c1dfe316499e74f9aa918f0bde40b94eb33f9f2b113b38c2883a21612a5455949fe9bb79f2f6c5a70fd4a0b64147eb4a88a94d9d1c diff --git a/dev-python/anyqt/anyqt-0.2.0.ebuild b/dev-python/anyqt/anyqt-0.2.0.ebuild deleted file mode 100644 index ac7a4519c107..000000000000 --- a/dev-python/anyqt/anyqt-0.2.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 virtualx - -DESCRIPTION="PyQt4/PyQt5 compatibility layer" -HOMEPAGE=" - https://github.com/ales-erjavec/anyqt/ - https://pypi.org/project/AnyQt/ -" -SRC_URI=" - https://github.com/ales-erjavec/anyqt/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - || ( - dev-python/pyside2[${PYTHON_USEDEP}] - dev-python/PyQt5[${PYTHON_USEDEP}] - ) -" -BDEPEND=" - test? ( - dev-python/pyside2[testlib,${PYTHON_USEDEP}] - dev-python/PyQt5[testlib,${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - local -x QT_API - # plugins may preload Qt modules - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - for QT_API in pyqt5 pyside2; do - local EPYTEST_IGNORE=() - [[ ${QT_API} == pyside2 ]] && EPYTEST_IGNORE+=( - tests/test_qaction_set_menu.py - ) - - einfo "Testing ${QT_API}" - nonfatal epytest tests || - die "Tests failed with ${EPYTHON} / ${QT_API}" - done -} diff --git a/dev-python/anyqt/metadata.xml b/dev-python/anyqt/metadata.xml deleted file mode 100644 index 0931ff56dac6..000000000000 --- a/dev-python/anyqt/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - amynka@gentoo.org - - - AnyQt - - diff --git a/dev-python/apprise/Manifest b/dev-python/apprise/Manifest index 9c6b2d8567f7..ab95fdbe6b00 100644 --- a/dev-python/apprise/Manifest +++ b/dev-python/apprise/Manifest @@ -1,2 +1,3 @@ DIST apprise-1.7.4.tar.gz 1648673 BLAKE2B 33c91a63e3d0e730dcfe2b99433cd97e16ff9635e9ff717e9c4f7b708e6536185265e591ff419a785044877cadd4793f2df73fe9420ffed65838fb16654810f8 SHA512 5e3ab2136f1bdbd9d769fb3e3c5a5c899834b7ffb6ba57f3601079d516e31bed9d988b76745c251fff6df91f1fcd186d23a0878165ad73b811f76a8118278a64 DIST apprise-1.7.5.tar.gz 1652098 BLAKE2B 01acc8be50b76cdcb5c7ce068b6f644d5edbbf28ea964d95e8d2ea0579a3a9c60e9715ae482ec0d7f16f4ce8118acf99e4159249bc763f268f89362a3e4fcde9 SHA512 d783d74a8e4a9f9b39c2ab86c0207a99e6f5fe30492b5bc50cb7008477acc1c5831d94c18bd3cee22fa28e028571108237191cc7a253aa072e121cecd0ce7afa +DIST apprise-1.7.6.tar.gz 1656123 BLAKE2B 49720f6ba6522f3496ad5cbf5bf72340c6b21f207d11f3c3fcdd113db2e01730b64209fad1d0c7f1ed357251e567a0fe8c875b2ab8f1befdeeab9af59f5678e3 SHA512 39fdfd129d9e8bc16070a015bc9e2b4f4bf6e61e1b87ee45ec11e99e7e87dcc3896312c7ff71d0dac9532cee36709de40d6397d98b8affda069cb3a436ab8683 diff --git a/dev-python/apprise/apprise-1.7.6.ebuild b/dev-python/apprise/apprise-1.7.6.ebuild new file mode 100644 index 000000000000..a85837c32c40 --- /dev/null +++ b/dev-python/apprise/apprise-1.7.6.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Push Notifications that work with just about every platform" +HOMEPAGE=" + https://pypi.org/project/apprise/ + https://github.com/caronc/apprise/ +" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv" +IUSE="+dbus mqtt" + +RDEPEND=" + dev-python/click[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/requests-oauthlib[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) + mqtt? ( dev-python/paho-mqtt[${PYTHON_USEDEP}] ) +" +BDEPEND=" + dev-python/Babel[${PYTHON_USEDEP}] + test? ( + dev-python/pytest-mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest diff --git a/dev-python/astunparse/Manifest b/dev-python/astunparse/Manifest deleted file mode 100644 index 82d2f7d59c40..000000000000 --- a/dev-python/astunparse/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST astunparse-1.6.3.tar.gz 18290 BLAKE2B d7e6fa3ba58c6e112eb84720832890f4515b1c4ed420587565cdff37da893c07eefd0b9eb00795a3eb08bf56834d65150298a6be65e524b0c267c38e6f9c20d1 SHA512 12e99b32524e551494d3053a57aeb646bca8a96a9aa17b0737e6dace6c11874e2e7633d82197cacc0b55622bea637030344ab45c8db57ef244bd63663799d2e9 diff --git a/dev-python/astunparse/astunparse-1.6.3-r1.ebuild b/dev-python/astunparse/astunparse-1.6.3-r1.ebuild deleted file mode 100644 index 9b2343f7d389..000000000000 --- a/dev-python/astunparse/astunparse-1.6.3-r1.ebuild +++ /dev/null @@ -1,39 +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="Astun parser for python" -HOMEPAGE=" - https://github.com/simonpercivall/astunparse/ - https://pypi.org/project/astunparse/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86" - -RDEPEND=" - >=dev-python/six-1.6.1[${PYTHON_USEDEP}] - >=dev-python/wheel-0.23.0[${PYTHON_USEDEP}] -" - -PATCHES=( - "${FILESDIR}/astunparse-1.6.2-tests.patch" - # From Fedora - "${FILESDIR}/${P}-py39.patch" - # From Debian - "${FILESDIR}/${P}-test-py311.patch" -) - -distutils_enable_tests unittest - -python_install_all() { - distutils-r1_python_install_all - dodoc *.rst -} diff --git a/dev-python/astunparse/files/astunparse-1.6.2-tests.patch b/dev-python/astunparse/files/astunparse-1.6.2-tests.patch deleted file mode 100644 index b82c22831a9b..000000000000 --- a/dev-python/astunparse/files/astunparse-1.6.2-tests.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/tests/common.py b/tests/common.py -index 95b9755..41123de 100644 ---- a/tests/common.py -+++ b/tests/common.py -@@ -1,6 +1,7 @@ - import codecs - import os - import sys -+import site - if sys.version_info < (2, 7): - import unittest2 as unittest - else: -@@ -175,9 +176,7 @@ class AstunparseCommonTestCase: - def check_roundtrip(self, code1, filename="internal", mode="exec"): - raise NotImplementedError() - -- test_directories = [ -- os.path.join(getattr(sys, 'real_prefix', sys.prefix), -- 'lib', 'python%s.%s' % sys.version_info[:2])] -+ test_directories = [os.path.dirname(d) for d in site.getsitepackages()] - - def test_files(self): - names = [] diff --git a/dev-python/astunparse/files/astunparse-1.6.3-py39.patch b/dev-python/astunparse/files/astunparse-1.6.3-py39.patch deleted file mode 100644 index ab8116a559ac..000000000000 --- a/dev-python/astunparse/files/astunparse-1.6.3-py39.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 0388a0d2f42401dcedf7f89d3c291cfed3e4a3d5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Wed, 8 Jul 2020 20:15:57 +0200 -Subject: [PATCH 1/2] Adapt dump() behavior to match ast.dump() on Python 3.9+ - -In Python 3.9+, ast.dump() omits optional fields/attributes from the output if -their value is None. Such defaults are defined as class attributes. - -See https://bugs.python.org/issue36287 -And https://github.com/python/cpython/pull/18843 - -This patch does not change the output on previous Python versions, -because the class attributes are missing there. - -Fixes https://github.com/simonpercivall/astunparse/issues/56 ---- - lib/astunparse/printer.py | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/lib/astunparse/printer.py b/lib/astunparse/printer.py -index 92d64f7..7a33deb 100644 ---- a/lib/astunparse/printer.py -+++ b/lib/astunparse/printer.py -@@ -4,6 +4,9 @@ - import six - - -+_NOPE = object() -+ -+ - class Printer(ast.NodeVisitor): - - def __init__(self, file=sys.stdout, indent=" "): -@@ -19,6 +22,7 @@ def write(self, text): - self.f.write(six.text_type(text)) - - def generic_visit(self, node): -+ cls = type(node) - - if isinstance(node, list): - nodestart = "[" -@@ -27,7 +31,8 @@ def generic_visit(self, node): - else: - nodestart = type(node).__name__ + "(" - nodeend = ")" -- children = [(name + "=", value) for name, value in ast.iter_fields(node)] -+ children = [(name + "=", value) for name, value in ast.iter_fields(node) -+ if not (value is None and getattr(cls, name, _NOPE) is None)] - - if len(children) > 1: - self.indentation += 1 - -From ea2b578a1b653e73696db2392b8e3d5bf75dadc7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Wed, 8 Jul 2020 20:21:17 +0200 -Subject: [PATCH 2/2] Test and support Python 3.9 - ---- - setup.py | 1 + - tox.ini | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index e5a277a..29b384b 100755 ---- a/setup.py -+++ b/setup.py -@@ -52,6 +52,7 @@ def read_version(): - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', -+ 'Programming Language :: Python :: 3.9', - 'Topic :: Software Development :: Code Generators', - ], - test_suite='tests', diff --git a/dev-python/astunparse/files/astunparse-1.6.3-test-py311.patch b/dev-python/astunparse/files/astunparse-1.6.3-test-py311.patch deleted file mode 100644 index f17ff76f0f6f..000000000000 --- a/dev-python/astunparse/files/astunparse-1.6.3-test-py311.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Carsten Schoenert -Date: Sat, 31 Dec 2022 12:01:26 +0100 -Subject: tests: Skip test_files() on Python >= 3.11 - -Given functions from astunparse are now mostly "battery included" in -Python 3.10 and ongoing und the test itself is only a small part of the -testing I think it's o.k. to simply skip now this test until upstream -will probably do some adjustment. - -Forwarded: https://github.com/simonpercivall/astunparse/issues/67 ---- - tests/common.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/common.py b/tests/common.py -index 95b9755..7c8fa27 100644 ---- a/tests/common.py -+++ b/tests/common.py -@@ -179,6 +179,7 @@ class AstunparseCommonTestCase: - os.path.join(getattr(sys, 'real_prefix', sys.prefix), - 'lib', 'python%s.%s' % sys.version_info[:2])] - -+ @unittest.skipIf(sys.version_info >= (3, 11), "Ignoring if Python >= 3.11") - def test_files(self): - names = [] - for test_dir in self.test_directories: diff --git a/dev-python/astunparse/metadata.xml b/dev-python/astunparse/metadata.xml deleted file mode 100644 index bf7649e44504..000000000000 --- a/dev-python/astunparse/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - williamh@gentoo.org - William Hubbs - - - python@gentoo.org - Python - - - simonpercivall/astunparse - astunparse - - diff --git a/dev-python/aws-xray-sdk/Manifest b/dev-python/aws-xray-sdk/Manifest index e7832449086a..a0817e4c5abd 100644 --- a/dev-python/aws-xray-sdk/Manifest +++ b/dev-python/aws-xray-sdk/Manifest @@ -1,2 +1 @@ -DIST aws-xray-sdk-python-2.12.1.gh.tar.gz 275525 BLAKE2B 7aae0cc3d6b733ee80b553d087bd85d02329c7da3a8902cb428823af4a53d47a14089a274cfccdfb197a77370dcb71775e1d111bb76205a1f09f9b60a5c92967 SHA512 3c830cf81f353a2805b641bda3d38d72a1286d413e0cd087bfeac78bfe00e7853c19ddab96f18275e7fd95317c2a6650d5e4b287d63c1d3900b25414a525c3dc DIST aws-xray-sdk-python-2.13.0.gh.tar.gz 276162 BLAKE2B 60a8cf121139b5a704f47676a10534a7e9e5cbbcadc3a10e2f864f2d6baef8b0d8fe82ef9356d3e459d21628584ec98d4a89ad31b8d982dc8859d0cdb0240999 SHA512 c36907788a891a8adef94591172c53dcc0ebde5c0a3552154a313d93af66d50d88aa3422c1abeba89e629aa224beee5eb17e14f272ee312c76aa7f437fadb77c diff --git a/dev-python/aws-xray-sdk/aws-xray-sdk-2.12.1.ebuild b/dev-python/aws-xray-sdk/aws-xray-sdk-2.12.1.ebuild deleted file mode 100644 index 06fa6d981436..000000000000 --- a/dev-python/aws-xray-sdk/aws-xray-sdk-2.12.1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 - -MY_P=aws-xray-sdk-python-${PV} -DESCRIPTION="AWS X-Ray SDK for Python" -HOMEPAGE=" - https://github.com/aws/aws-xray-sdk-python/ - https://pypi.org/project/aws-xray-sdk/ -" -SRC_URI=" - https://github.com/aws/aws-xray-sdk-python/archive/${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - >=dev-python/botocore-1.12.122[${PYTHON_USEDEP}] - dev-python/wrapt[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/bottle[${PYTHON_USEDEP}] - dev-python/flask[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/sqlalchemy[${PYTHON_USEDEP}] - dev-python/webtest[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_test() { - local -x DJANGO_SETTINGS_MODULE=tests.ext.django.app.settings - local -x AWS_SECRET_ACCESS_KEY=fake_key - local -x AWS_ACCESS_KEY_ID=fake_id - - local EPYTEST_DESELECT=( - # Internet access - tests/test_patcher.py::test_external_file - tests/test_patcher.py::test_external_module - tests/test_patcher.py::test_external_submodules_full - tests/test_patcher.py::test_external_submodules_ignores_file - tests/test_patcher.py::test_external_submodules_ignores_module - # benchmark - tests/test_local_sampling_benchmark.py - # Fails, probably because above is ignored - tests/test_async_local_storage.py::test_localstorage_isolation - tests/test_async_recorder.py::test_capture - tests/test_async_recorder.py::test_concurrent_calls - tests/test_async_recorder.py::test_async_context_managers - ) - local EPYTEST_IGNORE=( - # unpackaged deps - tests/ext/aiobotocore - tests/ext/pg8000 - tests/ext/psycopg2 - tests/ext/pymysql - tests/ext/pynamodb - tests/ext/sqlalchemy_core/test_postgres.py - tests/ext/django/test_db.py - # Internet access - tests/ext/httplib - tests/ext/httpx - tests/ext/requests - # requires old package vesions - tests/ext/aiohttp - tests/ext/django - tests/ext/flask_sqlalchemy - tests/ext/sqlalchemy - ) - - epytest -p no:django -} diff --git a/dev-python/aws-xray-sdk/aws-xray-sdk-2.13.0.ebuild b/dev-python/aws-xray-sdk/aws-xray-sdk-2.13.0.ebuild index ed7e4879a7b5..323ba5a787a4 100644 --- a/dev-python/aws-xray-sdk/aws-xray-sdk-2.13.0.ebuild +++ b/dev-python/aws-xray-sdk/aws-xray-sdk-2.13.0.ebuild @@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" RDEPEND=" >=dev-python/botocore-1.12.122[${PYTHON_USEDEP}] diff --git a/dev-python/beagle/beagle-0.3.0-r1.ebuild b/dev-python/beagle/beagle-0.3.0-r1.ebuild index 1a43df58648d..be3bc8bb4e7f 100644 --- a/dev-python/beagle/beagle-0.3.0-r1.ebuild +++ b/dev-python/beagle/beagle-0.3.0-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} ) inherit distutils-r1 pypi DESCRIPTION="Command line client for Hound, the code search tool" diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest index a86b25069c71..dea8dcaaa157 100644 --- a/dev-python/black/Manifest +++ b/dev-python/black/Manifest @@ -1,5 +1,3 @@ DIST black-23.12.1.tar.gz 620809 BLAKE2B 8522183d8004dd094f87fc8efcbbbafede9f94ded2f67d4815059534da91c969067c5c508636c2654894109f91d8fb5b26f23351b5ffff451aeac8ed5d146da4 SHA512 1a90eadbb7ccf1dd6c4c7d858b3360b7c62c04bf1826dd4817ddb8d542c3155fc72a80d53aa3be34375bd7006ab65432e006572bc5d1eeb6ff23cfa460072e93 -DIST black-24.1.0.tar.gz 622911 BLAKE2B 371a334df390f758fe482dac42345ab0cd7058c2dcbb49f5ce4337fedfe5b330308ab2644438a447ae76413fc95b65ba0fb0ab68a3a294e12f2fe147cebdfc25 SHA512 f9d2315743b91dcc563f8e57d4bfb3d80aff2b6a8f426d348c84d23cbcc1fe85107b4b3d78f396959d10240b75586e29bb26d7e767d382cc9d977703f2fa8d09 -DIST black-24.1.1.tar.gz 623755 BLAKE2B 32e12a3c1b0ad7cb94970b8d887444e0ff05c8044ce7b843710ad4494b6c1d8d4e74a76ce79178bb468fc1ed813bd4e17d3b1ba24f4fe6a6c3aeaf4bf2afe499 SHA512 507555c330a4ef5869b11d9b3ad19b6234c035bb2a28fa497aac911303bbc2d546601c1d587c8a824403c346eb5b940aaec2989c20dffead6fa881e496be5672 -DIST black-24.2.0.tar.gz 631598 BLAKE2B 4533768f508408dbdcca72db4600ddf244cddadd985e960cd7292809ebc0e2ed7f89aeab1f9af84e17a58d232f19b146980b79804f9cf3036bf757464737022a SHA512 23a40d7b2463d657c849bc54745036a253c67df6c58cef210fa4ee3c820cd83f687e3661f765939a5da23f7b75b10bb59e8b233731f37f21dd0301129e3fb5ea DIST black-24.3.0.tar.gz 634292 BLAKE2B 9a853a0943ba081ecb7a4c22913b060607ac47fb90b70a9645358d681f3eab55707ad6fe9ad9928ba0d39a8adf5dfde0168598a8abcc24b823b407287cefaf82 SHA512 57e3b651009578f1d15b6e9ffb49d24be80885b2cf7ad48a68407862778ac2099d119e7ba6d58ddea4fc7fc21345435a7572a970baf882f763d9347868d5504b +DIST black-24.4.0.tar.gz 635902 BLAKE2B 2821c0f4674524d3457fb8cbf1f1224d9c7e76abdbb1e47bcd4d488ff560a417b3ad57223318b28951c92c59d13c4a2894a323865a2be2859e7b7e891c54064c SHA512 3f9150faa36413ffff3a65f9f55b33a6b69b3abec5bf649bfc0662a92faa41edc76e90151e27a74f04bc3defc0687c898d54b2f137d16d13ea46e86670aa7a98 diff --git a/dev-python/black/black-24.1.0.ebuild b/dev-python/black/black-24.1.0.ebuild deleted file mode 100644 index d7502a3d0049..000000000000 --- a/dev-python/black/black-24.1.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( python3_{10..12} pypy3 ) - -inherit distutils-r1 optfeature pypi - -DESCRIPTION="The uncompromising Python code formatter" -HOMEPAGE=" - https://black.readthedocs.io/en/stable/ - https://github.com/psf/black/ - https://pypi.org/project/black/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" - -RDEPEND=" - >=dev-python/click-8.0.0[${PYTHON_USEDEP}] - >=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}] - >=dev-python/packaging-22.0[${PYTHON_USEDEP}] - >=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}] - >=dev-python/platformdirs-2[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/tomli-1.1.0[${PYTHON_USEDEP}] - ' 3.10) -" -BDEPEND=" - dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}] - dev-python/hatch-vcs[${PYTHON_USEDEP}] - test? ( - >=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}] - dev-python/aiohttp-cors[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/parameterized[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - # incompatible with xdist - tests/test_black.py::TestCaching::test_output_locking_when_writeback_diff - tests/test_black.py::TestCaching::test_failed_formatting_does_not_get_cached -) - -pkg_postinst() { - optfeature "blackd - HTTP API for black" \ - "dev-python/aiohttp dev-python/aiohttp-cors" -} diff --git a/dev-python/black/black-24.1.1.ebuild b/dev-python/black/black-24.1.1.ebuild deleted file mode 100644 index d9cfa5e8b62e..000000000000 --- a/dev-python/black/black-24.1.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( python3_{10..12} pypy3 ) - -inherit distutils-r1 optfeature pypi - -DESCRIPTION="The uncompromising Python code formatter" -HOMEPAGE=" - https://black.readthedocs.io/en/stable/ - https://github.com/psf/black/ - https://pypi.org/project/black/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - -RDEPEND=" - >=dev-python/click-8.0.0[${PYTHON_USEDEP}] - >=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}] - >=dev-python/packaging-22.0[${PYTHON_USEDEP}] - >=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}] - >=dev-python/platformdirs-2[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/tomli-1.1.0[${PYTHON_USEDEP}] - ' 3.10) -" -BDEPEND=" - dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}] - dev-python/hatch-vcs[${PYTHON_USEDEP}] - test? ( - >=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}] - dev-python/aiohttp-cors[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/parameterized[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - # incompatible with xdist - tests/test_black.py::TestCaching::test_output_locking_when_writeback_diff - tests/test_black.py::TestCaching::test_failed_formatting_does_not_get_cached -) - -pkg_postinst() { - optfeature "blackd - HTTP API for black" \ - "dev-python/aiohttp dev-python/aiohttp-cors" -} diff --git a/dev-python/black/black-24.2.0.ebuild b/dev-python/black/black-24.2.0.ebuild deleted file mode 100644 index 0d889f9204fb..000000000000 --- a/dev-python/black/black-24.2.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( python3_{10..12} pypy3 ) - -inherit distutils-r1 optfeature pypi - -DESCRIPTION="The uncompromising Python code formatter" -HOMEPAGE=" - https://black.readthedocs.io/en/stable/ - https://github.com/psf/black/ - https://pypi.org/project/black/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - -RDEPEND=" - >=dev-python/click-8.0.0[${PYTHON_USEDEP}] - >=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}] - >=dev-python/packaging-22.0[${PYTHON_USEDEP}] - >=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}] - >=dev-python/platformdirs-2[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/tomli-1.1.0[${PYTHON_USEDEP}] - ' 3.10) -" -BDEPEND=" - dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}] - dev-python/hatch-vcs[${PYTHON_USEDEP}] - test? ( - >=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}] - dev-python/aiohttp-cors[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/parameterized[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -pkg_postinst() { - optfeature "blackd - HTTP API for black" \ - "dev-python/aiohttp dev-python/aiohttp-cors" -} diff --git a/dev-python/black/black-24.4.0.ebuild b/dev-python/black/black-24.4.0.ebuild new file mode 100644 index 000000000000..bbf320447679 --- /dev/null +++ b/dev-python/black/black-24.4.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..12} pypy3 ) + +inherit distutils-r1 optfeature pypi + +DESCRIPTION="The uncompromising Python code formatter" +HOMEPAGE=" + https://black.readthedocs.io/en/stable/ + https://github.com/psf/black/ + https://pypi.org/project/black/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" + +RDEPEND=" + >=dev-python/click-8.0.0[${PYTHON_USEDEP}] + >=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}] + >=dev-python/packaging-22.0[${PYTHON_USEDEP}] + >=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}] + >=dev-python/platformdirs-2[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/tomli-1.1.0[${PYTHON_USEDEP}] + ' 3.10) +" +BDEPEND=" + dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}] + dev-python/hatch-vcs[${PYTHON_USEDEP}] + test? ( + >=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}] + dev-python/aiohttp-cors[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/parameterized[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +pkg_postinst() { + optfeature "blackd - HTTP API for black" \ + "dev-python/aiohttp dev-python/aiohttp-cors" +} diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest index 37635fb80719..3d187e3058ff 100644 --- a/dev-python/boto3/Manifest +++ b/dev-python/boto3/Manifest @@ -1,5 +1,3 @@ -DIST boto3-1.34.69.gh.tar.gz 787293 BLAKE2B 9e46a959f3efdc3e673d38c8e3c30b8ceed1c1f47d685466e4164bcc1000381710bf8d8b6afff0999185ccddf38da591df004c54709729f2181308cb2279c43f SHA512 ef765518de95468e66270cea6dc93ede48547fb37db3ed9429659d85fb25174162cd062814c6adefeb8385c14079e7927f52d66501ab45f8d251ccfc830465e4 DIST boto3-1.34.74.gh.tar.gz 790202 BLAKE2B 4368db3e11d6bda6eee4ccde82bcc0c2c5a67448400ce0d29d221840360348ab1c7d3c8360ff3c91190ebccb30e187c6fc3ed72f29f1a1d1f883888a8cad12dc SHA512 977e1b9f8a9506bd040ff6a9a1df106294ff62a100cf5cb31aeaa363a4f3fe28cab71e4740028202829fac3023bf832bd4ac25b3474c2a5e107892c05b356e0c DIST boto3-1.34.79.gh.tar.gz 792796 BLAKE2B 97a4f8e6fc33bcfe2817ce353df8ff6354bc89c449e5e29833704e12513aa21129863164c51047b17c7f15a47f0ceb90c60a83071464283292089b2535e8fed9 SHA512 15161face918253eac06dfbeb67adb8ef5ed6902b2eed760feb9fdd3aee0e38da3511aa7d829914b6f80addff7feffae7d3645f7567643a37d3659001d7b6a1a -DIST boto3-1.34.80.gh.tar.gz 793186 BLAKE2B aa45147344c21291f413580473bdd358d25e69944c16ea43e731465911c5c16fdc1e9fde20d69634debdc7cd0af07a999072ee6ecfb6c0b93a96ecb66dee78b3 SHA512 a43be78c98060a0aeb232dad7bb118768711e375f8137d0b59293397056a360a6a6e7d067651404c4ae43180d9c5e100fd2ee041b8ecc17e9982a30cdfc0e8d4 -DIST boto3-1.34.81.gh.tar.gz 793676 BLAKE2B 40e8eccfc1a619c5d542233faa13aa099fad43c6eddf669914cdbcd58c44bb13433ccad44d6aa2ef5162ba4f7725269b60e82d9093b2119b029eb884b0fdb4ef SHA512 a1823dd568f3e46bdea0830cd1a56aecd949d7e5f1e3558f759a672ed10f754faf546a69c8f1489dc203f04dc173de644689b6bdb53c4446f3cf81adbabc9211 +DIST boto3-1.34.84.gh.tar.gz 796658 BLAKE2B 76ad7997f92167f1ed2f14a0a780a1a58b4a853ea132ca38797a228382ad8f55264dfaee99ebf6f8e2bea1848ec918f7b3b0943d0bb6a81b3b858e729b2e74c4 SHA512 55988d7ba69a46b986ed2cffd46b37a154baaa3a73ce62d9ee5b4b8b6f8987f714034ae4f3e59ed9907920216eaf8b18edea4c0fbac99037979b8b30e3b71133 diff --git a/dev-python/boto3/boto3-1.34.69.ebuild b/dev-python/boto3/boto3-1.34.69.ebuild deleted file mode 100644 index 2a35a5b9c0d0..000000000000 --- a/dev-python/boto3/boto3-1.34.69.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 - -DESCRIPTION="The AWS SDK for Python" -HOMEPAGE=" - https://github.com/boto/boto3/ - https://pypi.org/project/boto3/ -" -SRC_URI=" - https://github.com/boto/boto3/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - >=dev-python/botocore-${PV}[${PYTHON_USEDEP}] - >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -python_prepare_all() { - # don't lock versions to narrow ranges - sed -e '/botocore/ d' \ - -e '/jmespath/ d' \ - -e '/s3transfer/ d' \ - -i setup.py || die - - # 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 - - distutils-r1_python_prepare_all -} - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest tests/{functional,unit} -} diff --git a/dev-python/boto3/boto3-1.34.74.ebuild b/dev-python/boto3/boto3-1.34.74.ebuild index b64e7191fd19..2a35a5b9c0d0 100644 --- a/dev-python/boto3/boto3-1.34.74.ebuild +++ b/dev-python/boto3/boto3-1.34.74.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" >=dev-python/botocore-${PV}[${PYTHON_USEDEP}] diff --git a/dev-python/boto3/boto3-1.34.81.ebuild b/dev-python/boto3/boto3-1.34.81.ebuild deleted file mode 100644 index 2c733040b7a3..000000000000 --- a/dev-python/boto3/boto3-1.34.81.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 - -DESCRIPTION="The AWS SDK for Python" -HOMEPAGE=" - https://github.com/boto/boto3/ - https://pypi.org/project/boto3/ -" -SRC_URI=" - https://github.com/boto/boto3/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - >=dev-python/botocore-${PV}[${PYTHON_USEDEP}] - >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -python_prepare_all() { - # don't lock versions to narrow ranges - sed -e '/botocore/ d' \ - -e '/jmespath/ d' \ - -e '/s3transfer/ d' \ - -i setup.py || die - - # 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 - - distutils-r1_python_prepare_all -} - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest tests/{functional,unit} -} diff --git a/dev-python/boto3/boto3-1.34.80.ebuild b/dev-python/boto3/boto3-1.34.84.ebuild similarity index 100% rename from dev-python/boto3/boto3-1.34.80.ebuild rename to dev-python/boto3/boto3-1.34.84.ebuild diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest index e9f347d50f0a..4631e546882c 100644 --- a/dev-python/botocore/Manifest +++ b/dev-python/botocore/Manifest @@ -1,5 +1,3 @@ -DIST botocore-1.34.69.gh.tar.gz 12790282 BLAKE2B 3d12eb5eb8e85777b43b3774e783c907f05e50dfe93445920ee0f42a82857ba7a70c5641e3cbfc03ab05f81f7cd989ff79e332bf2ae192b9bf7b3b3cbe6e9c0e SHA512 b520c5d3c6ce2f1db3e8620e5f7c882ed8483928de1cb32d22eabe76262ed8658614a0b1db42ceff445f11b009c48ef9a5761490e5982154e14173750b9e2554 DIST botocore-1.34.74.gh.tar.gz 12820469 BLAKE2B e9d7a35e82aee30666952ea6f74d8d0f695efad2fd0da520b70fdd313cabf3aff6e67fa71543c630bcfb4b4f78f780321babaf118990d8136b79755beadd8a5a SHA512 f7d741bd86e249ae46a7f79828c8b63c66519f9ae203f1a14a17e126c22d9e3d94710f5f5992f057491d3f7e41c7ea180255e1f766dc3bdee96ddb2ac6e28312 DIST botocore-1.34.79.gh.tar.gz 12882231 BLAKE2B 56d7d2a1046a164f4f64f375f608b8646e0f7c266b1c7ab37ff7141fd8d8d843ce2890b0a947f051956f61fb2cfc75c2eb3b3cf70305de4ba9ce2e18d8569ded SHA512 00717ad582e23e1c4f4d803eea2069224fc69c6e701d6b4a55d0d99806cebfb1e2c45c7eb65464b84e0cc63399a7b6235b90ba9245e27fe435eca6079b5c29aa -DIST botocore-1.34.80.gh.tar.gz 12886772 BLAKE2B a77200c5fa28ec9f1a8d65aae08130906719bd530065407446084354e49962f1db22a0c5370d9634d916c563899f3886613a35c24fa2f02967bbf1d191d27b0e SHA512 b2b767f54426bd7cef6d49cdaa4e3d81a11a557e3364646b1cb738bc3f050172f08127c95bca00b170cf2758a71e1ef0f4273bfa7dda6f6dc05b252f73ac903f -DIST botocore-1.34.81.gh.tar.gz 12888862 BLAKE2B 75394b63e4617da9e41801de96b4fa2e590add49e7697771e018ab0ca161dbc3eab95b4af98a1886e8d41419b9e3508727912082708e0197f676437cd19091ef SHA512 dba689f4fe6b32eeb4ef32b49217849a5b6624f8ce3bfeb0857f88b98f84c38d4f04b3ef4c5d3e613ed96117f433cb16562984f6d826149dbbed80230d54386b +DIST botocore-1.34.84.gh.tar.gz 12910232 BLAKE2B 3a9f9073e34d203f05ae44f9dc437f4d325084dbe858e59008a7b0c826c53d6e9a1911f6e9203aa476787878de88a1d8a9c1e26cedc3c34bebf6739c9bb10fce SHA512 247578e628e5ea57cfb956a10c0975d7a2caa24617e8572f90ca2a0286c75077a732328cb2dde34c937113d288c4a8a346adc074aae14dcebfa16c309d801a31 diff --git a/dev-python/botocore/botocore-1.34.69.ebuild b/dev-python/botocore/botocore-1.34.69.ebuild deleted file mode 100644 index 7a44b043295f..000000000000 --- a/dev-python/botocore/botocore-1.34.69.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 - -DESCRIPTION="Low-level, data-driven core of boto 3" -HOMEPAGE=" - https://github.com/boto/botocore/ - https://pypi.org/project/botocore/ -" -SRC_URI=" - https://github.com/boto/botocore/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}] -" -# unbundled packages -RDEPEND+=" - dev-python/requests[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/jsonschema[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_prepare() { - # unpin deps - sed -i -e "s:>=.*':':" setup.py || die - - # unbundle deps - rm -r botocore/vendored || die - find -name '*.py' -exec sed -i \ - -e 's:from botocore[.]vendored import:import:' \ - -e 's:from botocore[.]vendored[.]:from :' \ - {} + || die - - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=( - # rely on bundled six - tests/functional/test_six_imports.py::test_no_bare_six_imports - tests/functional/test_six_threading.py::test_six_thread_safety - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest tests/{functional,unit} -} diff --git a/dev-python/botocore/botocore-1.34.74.ebuild b/dev-python/botocore/botocore-1.34.74.ebuild index ba6cd2a5d2a2..7a44b043295f 100644 --- a/dev-python/botocore/botocore-1.34.74.ebuild +++ b/dev-python/botocore/botocore-1.34.74.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" =.*':':" setup.py || die - - # unbundle deps - rm -r botocore/vendored || die - find -name '*.py' -exec sed -i \ - -e 's:from botocore[.]vendored import:import:' \ - -e 's:from botocore[.]vendored[.]:from :' \ - {} + || die - - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=( - # rely on bundled six - tests/functional/test_six_imports.py::test_no_bare_six_imports - tests/functional/test_six_threading.py::test_six_thread_safety - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest tests/{functional,unit} -} diff --git a/dev-python/botocore/botocore-1.34.80.ebuild b/dev-python/botocore/botocore-1.34.84.ebuild similarity index 100% rename from dev-python/botocore/botocore-1.34.80.ebuild rename to dev-python/botocore/botocore-1.34.84.ebuild diff --git a/dev-python/bottleneck/bottleneck-1.3.8.ebuild b/dev-python/bottleneck/bottleneck-1.3.8.ebuild index 6403651bbd84..d0c36fd55989 100644 --- a/dev-python/bottleneck/bottleneck-1.3.8.ebuild +++ b/dev-python/bottleneck/bottleneck-1.3.8.ebuild @@ -21,11 +21,11 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" -RDEPEND=" - >=dev-python/numpy-1.9.1[${PYTHON_USEDEP}] -" DEPEND=" - ${RDEPEND} + >=dev-python/numpy-1.9.1:=[${PYTHON_USEDEP}] +" +RDEPEND=" + ${DEPEND} " distutils_enable_tests pytest diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest index 5c504c9291ed..056183421786 100644 --- a/dev-python/cachelib/Manifest +++ b/dev-python/cachelib/Manifest @@ -1 +1,2 @@ DIST cachelib-0.12.0.gh.tar.gz 30768 BLAKE2B 5d147e63d0be58c7134f851cea79a002aa89b5364aec5c0e0906bfb9573578b094d71f361265b15eb519da897eed069d4aaeae1a8599176a95c074186018a713 SHA512 a35bfa9dfb6db8ae0e6fcdad86e5221d82144d5c0fcdb046b951d193f70f706712800b27c27825f8020314c521eb568131257ce0e20dc820cb3f7f8ffbf2650f +DIST cachelib-0.13.0.gh.tar.gz 31116 BLAKE2B fcb5f065778533bbe9200c77f12d374a62111c5dc26e366c07ea0986bba138a97c56de0440dd3b4a5603b8700ec8035b65ebe95d48e4dcf60c03f78a2215f128 SHA512 6b58f3823d1169ca1e25a5accc7a51752e26c8e7f62b58a571b0de4d8792dd6c3eb3d3c60f3843653b7aaa17177a1d6d56e442ceb6b69a486d76511003ff97b2 diff --git a/dev-python/cachelib/cachelib-0.13.0.ebuild b/dev-python/cachelib/cachelib-0.13.0.ebuild new file mode 100644 index 000000000000..0262028d040d --- /dev/null +++ b/dev-python/cachelib/cachelib-0.13.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 + +DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug" +HOMEPAGE=" + https://pypi.org/project/cachelib/ + https://github.com/pallets-eco/cachelib/ +" +SRC_URI=" + https://github.com/pallets-eco/cachelib/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +BDEPEND=" + test? ( + dev-db/redis + dev-python/pylibmc[${PYTHON_USEDEP}] + dev-python/pytest-xprocess[${PYTHON_USEDEP}] + dev-python/redis[${PYTHON_USEDEP}] + net-misc/memcached + www-servers/uwsgi[python,${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +EPYTEST_IGNORE=( + # bug #818523 + tests/test_redis_cache.py + # requires some test server running + # (these tests require dev-python/boto3) + tests/test_dynamodb_cache.py + # requires mongo test server + tests/test_mongodb_cache.py +) diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest index 8d1faf61b2b0..7cb9096822bc 100644 --- a/dev-python/cbor2/Manifest +++ b/dev-python/cbor2/Manifest @@ -1 +1,2 @@ DIST cbor2-5.6.2.tar.gz 100016 BLAKE2B a0a71f40f39ba86c545e5f8462af74e17b6851d350f0c9831be2ac414216437021150d0d7ddb481d62454d5ff73b99ccda7ae0676fd6d53b7e3228616fa0042d SHA512 da98aaf17b17b50bdfc4dbecc1e88e70ed6e99f26e9eb4124de0e92ea2d63f827cee3da83c9aeba1af386cf5a7e95d76be30c79b0a8fde7d53ee8c203b2119b9 +DIST cbor2-5.6.3.tar.gz 100224 BLAKE2B bccdca4fb2659c201663897a27801b7ae040fecc1c734356d4e4859df94eb65ef122bdda68384670102ee40476135d0c781c9f966b7c2845babb2bbd9729bc78 SHA512 1ab6a88a95cde178b21a75275fb286038f15d2fbd752059f9fc6fdb64e23eca90f65f7e443cae4bdbb7f451378711b20963909136c06b3bb4f054d52a7a95207 diff --git a/dev-python/cbor2/cbor2-5.6.3.ebuild b/dev-python/cbor2/cbor2-5.6.3.ebuild new file mode 100644 index 000000000000..4d83e1c675b4 --- /dev/null +++ b/dev-python/cbor2/cbor2-5.6.3.ebuild @@ -0,0 +1,46 @@ +# 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=( pypy3 python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support" +HOMEPAGE=" + https://github.com/agronholm/cbor2/ + https://pypi.org/project/cbor2/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="+native-extensions" + +BDEPEND=" + >=dev-python/setuptools-61[${PYTHON_USEDEP}] + >=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}] + test? ( + dev-python/hypothesis[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +python_prepare_all() { + # remove pytest-cov dep + sed -i -e "s/--cov//" pyproject.toml || die + distutils-r1_python_prepare_all +} + +python_compile() { + local -x CBOR2_BUILD_C_EXTENSION=1 + # pypy3 not supported upstream + if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then + CBOR2_BUILD_C_EXTENSION=0 + fi + distutils-r1_python_compile +} diff --git a/dev-python/dbus-next/dbus-next-0.2.3-r1.ebuild b/dev-python/dbus-next/dbus-next-0.2.3-r1.ebuild index 539b62aab174..72eade342d51 100644 --- a/dev-python/dbus-next/dbus-next-0.2.3-r1.ebuild +++ b/dev-python/dbus-next/dbus-next-0.2.3-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_{10..12} ) inherit distutils-r1 virtualx @@ -22,7 +22,7 @@ S="${WORKDIR}"/python-${P} LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~riscv x86" BDEPEND=" test? ( @@ -36,6 +36,11 @@ PATCHES=( "${FILESDIR}"/${PN}-0.2.3-glib-crash.patch ) +EPYTEST_DESELECT=( + # test does not work anymore with dbus 1.14.4+ + # https://github.com/altdesktop/python-dbus-next/issues/135 + test/test_tcp_address.py::test_tcp_connection_with_forwarding +) EPYTEST_IGNORE=( # "interface not found on this object: org.freedesktop.DBus.Debug.Stats" # Seems like we build dbus w/o this? diff --git a/dev-python/django-configurations/Manifest b/dev-python/django-configurations/Manifest index 72acc10aa062..18ca1796f913 100644 --- a/dev-python/django-configurations/Manifest +++ b/dev-python/django-configurations/Manifest @@ -1,2 +1 @@ DIST django-configurations-2.5.1.tar.gz 43225 BLAKE2B 1b9cd14ea50d03500cc05790e831832f6e4e3a917903eb48aa40c2d2dd46a59684ce82b484229fd912a18bcdef4d1887989489b4ab461740f981a87c3a7914f5 SHA512 5584446a1b48a0c080401b377786864a905a28337e2912c71ba586ad438df6efeb74c2de1058b77d79f3ba7db85dd443f05dc81013576d301a43bad6736e72e2 -DIST django-configurations-2.5.tar.gz 43152 BLAKE2B 35976466132f9b78a031955c891733cb0a01f20d39d53708ed5100492b3a1963e50228f3175437f54201fb6d992312c641e08562a85cf57cb089f2c7678101e7 SHA512 a6e3f301bf6123234245a5fe88f4b0eecfc021230c593d2864a969560d52c70b6932c0fac64cd83f21fb06b83821d37320181f0601450d6f3cd4e4b06c4ae9f5 diff --git a/dev-python/django-configurations/django-configurations-2.5.1.ebuild b/dev-python/django-configurations/django-configurations-2.5.1.ebuild index 11a7c3d41a65..74ebf3b12c3e 100644 --- a/dev-python/django-configurations/django-configurations-2.5.1.ebuild +++ b/dev-python/django-configurations/django-configurations-2.5.1.ebuild @@ -18,7 +18,7 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-python/django-configurations/django-configurations-2.5.ebuild b/dev-python/django-configurations/django-configurations-2.5.ebuild deleted file mode 100644 index 74ebf3b12c3e..000000000000 --- a/dev-python/django-configurations/django-configurations-2.5.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( pypy3 python3_{10..12} ) - -inherit distutils-r1 pypi - -DESCRIPTION="A helper for organizing Django settings" -HOMEPAGE=" - https://pypi.org/project/django-configurations/ - https://github.com/jazzband/django-configurations/ - https://django-configurations.readthedocs.io/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/django-3.2[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/setuptools-scm[${PYTHON_USEDEP}] - test? ( - dev-python/django-cache-url[${PYTHON_USEDEP}] - dev-python/dj-database-url[${PYTHON_USEDEP}] - dev-python/dj-email-url[${PYTHON_USEDEP}] - dev-python/dj-search-url[${PYTHON_USEDEP}] - ) -" - -export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} - -python_test() { - local -x DJANGO_SETTINGS_MODULE=tests.settings.main - local -x DJANGO_CONFIGURATION=Test - PYTHONPATH=. django-cadmin test -v2 || die "Tests failed with ${EPYTHON}" -} diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest index 1b4d366e9a0a..302ad5a338bf 100644 --- a/dev-python/django-otp/Manifest +++ b/dev-python/django-otp/Manifest @@ -1,2 +1,3 @@ DIST django_otp-1.3.0.tar.gz 69013 BLAKE2B 4b6143bb8863e6c151df954a3c4ac4ecca770b1f396dd291e8634e8ad5e0755514111dac02307120e74abacf04bc681503a973bba067817c80bcffc8c462c592 SHA512 ef63c5db096ce7d1b10d6b2a99ab6db46b779d4221f509452921fcbf338decbd5c799aec7476587a03b34288ef3f5ff1964dee72105b65f04a22cbd53d445fa4 DIST django_otp-1.4.0.tar.gz 71690 BLAKE2B 61144122ab6dec438dcc3136e8856b4d66c598e811f1fdd21e5ba77a907ae5bda88fd543a1c87a165d9ba30ce2bcd7415b04d598719ecb46f2f3ddc15a342aa0 SHA512 df4a11d3cb6a55e2506815b81c7e8cc3e9c272afd8d1d9ba94fd1336467b177ea3eb1e89129c3c727d7ce74ce159e5d153a22e0be2d3d638c8357653b22dba56 +DIST django_otp-1.4.1.tar.gz 71847 BLAKE2B 49764cd1957ab2a6644780c1c6a0947b20bb4a0c1ca286907122a8b47f937aca8d1d2e480f7a309b546ac503cb0c3b1ea3e03532e7d6c38fe8db1606406eda71 SHA512 bb041a6ecd93dbad4f83d6593dfbc2f4768e1a3e68df332a61ed9ce483a8ec7090179a6865b128d02a2fc5ba2b42cd63dc16595a7b98e2728733fc274d506b1a diff --git a/dev-python/django-otp/django-otp-1.4.1.ebuild b/dev-python/django-otp/django-otp-1.4.1.ebuild new file mode 100644 index 000000000000..758cf10a6598 --- /dev/null +++ b/dev-python/django-otp/django-otp-1.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 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Django framework adding two-factor authentication using one-time passwords" +HOMEPAGE=" + https://github.com/django-otp/django-otp/ + https://pypi.org/project/django-otp/ +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/django-3.2[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + $(python_gen_impl_dep sqlite) + dev-python/freezegun[${PYTHON_USEDEP}] + dev-python/qrcode[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/tomli[${PYTHON_USEDEP}] + ' 3.9 3.10) + ${RDEPEND} + ) +" + +python_test() { + local -x PYTHONPATH=test:${PYTHONPATH} + local -x DJANGO_SETTINGS_MODULE=test_project.settings + "${EPYTHON}" -m django test -v 2 django_otp || + die "Tests fail with ${EPYTHON}" +} diff --git a/dev-python/django-polymorphic/Manifest b/dev-python/django-polymorphic/Manifest new file mode 100644 index 000000000000..6b3175e1e369 --- /dev/null +++ b/dev-python/django-polymorphic/Manifest @@ -0,0 +1 @@ +DIST django-polymorphic-3.1.gh.tar.gz 104090 BLAKE2B de2a2b38f338a10198d00e70d1813e541bf627e2ba2f5e29f0844c9ec7034badba39c077a195fc8c2f71105f1b4e546b91218b95d2ac47020f0dc2e3a5b0baa8 SHA512 730f617009007f94e935870941fdd8973d0cd5995060afbd138622345de77fa48bf2afe037bfa2ad476cef0a31e90cab1eb55109c470ae815a98e1facfa8f125 diff --git a/dev-python/django-polymorphic/django-polymorphic-3.1-r1.ebuild b/dev-python/django-polymorphic/django-polymorphic-3.1-r1.ebuild new file mode 100644 index 000000000000..9f7d8b0b2c6e --- /dev/null +++ b/dev-python/django-polymorphic/django-polymorphic-3.1-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 + +DESCRIPTION="Seamless Polymorphic Inheritance for Django Models" +HOMEPAGE=" + https://github.com/jazzband/django-polymorphic/ + https://pypi.org/project/django-polymorphic/ +" +SRC_URI=" + https://github.com/jazzband/django-polymorphic/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/django-2.1[$PYTHON_USEDEP] +" + +DEPEND=" + test? ( + $(python_gen_impl_dep sqlite) + ${RDEPEND} + dev-python/dj-database-url[${PYTHON_USEDEP}] + ) +" + +python_test() { + "${EPYTHON}" runtests.py || die "Tests fail with ${EPYTHON}" +} diff --git a/dev-python/django-polymorphic/metadata.xml b/dev-python/django-polymorphic/metadata.xml new file mode 100644 index 000000000000..007d21b86f5b --- /dev/null +++ b/dev-python/django-polymorphic/metadata.xml @@ -0,0 +1,13 @@ + + + + + python@gentoo.org + Python + + + + django-polymorphic + jazzband/django-polymorphic + + diff --git a/dev-python/django-tables2/django-tables2-2.7.0.ebuild b/dev-python/django-tables2/django-tables2-2.7.0.ebuild index 9503ae38d137..e4c4723a2f79 100644 --- a/dev-python/django-tables2/django-tables2-2.7.0.ebuild +++ b/dev-python/django-tables2/django-tables2-2.7.0.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 @@ -18,8 +18,8 @@ SRC_URI=" -> ${P}.gh.tar.gz " -SLOT="0" LICENSE="BSD-2" +SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-python/django-taggit/Manifest b/dev-python/django-taggit/Manifest index 2267035622a5..d059385f71e2 100644 --- a/dev-python/django-taggit/Manifest +++ b/dev-python/django-taggit/Manifest @@ -1 +1,2 @@ DIST django-taggit-3.1.0.tar.gz 58238 BLAKE2B ea5c90300383294daf80315b013dc1171d94fe4994cdf58a9364666a879672bd5af35f3c620673cb0a9139d2a224bc06d58f933ae94ccd8a65b947c76ab0a0ca SHA512 8654b703cb9b3848a5185f1b88826a80eed44f00993d6272e8fbec1145e6c30be4c0840a0d6e88544d2f927c7c288c2be94e3df61cbe34c37f1f213a1bf0780d +DIST django-taggit-5.0.1.tar.gz 60372 BLAKE2B 1934fc0a92655db15a4997646c44d8faa57b48469421abb7c48ea248525f0c536d658a9a481ed646dc4846c2f8f6ca9799274f9961238bd727ef0bafbb0ddf0c SHA512 af7b04da8359ebf68ea1b5c1fba3ed509b5357d65cccd95d835e0db68431fcbf0057e613cd05c54ac76524c8fc1c23d0dbacae8b80a23bb7867a0fa4a62f445b diff --git a/dev-python/django-taggit/django-taggit-5.0.1.ebuild b/dev-python/django-taggit/django-taggit-5.0.1.ebuild new file mode 100644 index 000000000000..f4709002e528 --- /dev/null +++ b/dev-python/django-taggit/django-taggit-5.0.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Simple tagging for Django" +HOMEPAGE=" + https://github.com/jazzband/django-taggit/ + https://pypi.org/project/django-taggit/ +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/django-4.1[${PYTHON_USEDEP}] + dev-python/djangorestframework[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + ${RDEPEND} + ) +" + +python_test() { + "${EPYTHON}" -m django test -v 2 --settings=tests.settings || + die "Tests failed with ${EPYTHON}" +} diff --git a/dev-python/django_polymorphic/Manifest b/dev-python/django_polymorphic/Manifest deleted file mode 100644 index 8678dcfcd1fa..000000000000 --- a/dev-python/django_polymorphic/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST django_polymorphic-3.1.gh.tar.gz 104090 BLAKE2B de2a2b38f338a10198d00e70d1813e541bf627e2ba2f5e29f0844c9ec7034badba39c077a195fc8c2f71105f1b4e546b91218b95d2ac47020f0dc2e3a5b0baa8 SHA512 730f617009007f94e935870941fdd8973d0cd5995060afbd138622345de77fa48bf2afe037bfa2ad476cef0a31e90cab1eb55109c470ae815a98e1facfa8f125 diff --git a/dev-python/django_polymorphic/django_polymorphic-3.1-r1.ebuild b/dev-python/django_polymorphic/django_polymorphic-3.1-r1.ebuild deleted file mode 100644 index 63c1444d7b25..000000000000 --- a/dev-python/django_polymorphic/django_polymorphic-3.1-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 - -DESCRIPTION="Seamless Polymorphic Inheritance for Django Models" -HOMEPAGE="https://pypi.org/project/django-polymorphic/" -SRC_URI=" - https://github.com/django-polymorphic/django-polymorphic/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz" -S="${WORKDIR}/${P//_/-}" - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm64 ~x86" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/django-2.1[$PYTHON_USEDEP] -" - -DEPEND=" - test? ( - $(python_gen_impl_dep sqlite) - ${RDEPEND} - dev-python/dj-database-url[${PYTHON_USEDEP}] - ) -" - -python_test() { - "${EPYTHON}" runtests.py || die "Tests fail with ${EPYTHON}" -} diff --git a/dev-python/django_polymorphic/metadata.xml b/dev-python/django_polymorphic/metadata.xml deleted file mode 100644 index 950a1fc45eca..000000000000 --- a/dev-python/django_polymorphic/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - python@gentoo.org - Python - - - - django-polymorphic - django-polymorphic/django-polymorphic - - diff --git a/dev-python/dockerpty/dockerpty-0.4.1-r2.ebuild b/dev-python/dockerpty/dockerpty-0.4.1-r2.ebuild index 9b58cc5366ca..b21ca217ec51 100644 --- a/dev-python/dockerpty/dockerpty-0.4.1-r2.ebuild +++ b/dev-python/dockerpty/dockerpty-0.4.1-r2.ebuild @@ -1,26 +1,35 @@ -# 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_{10..12} ) + inherit distutils-r1 DESCRIPTION="Python library to use the pseudo-tty of a docker container" -HOMEPAGE="https://github.com/d11wtq/dockerpty" -SRC_URI="https://github.com/d11wtq/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" +HOMEPAGE=" + https://github.com/d11wtq/dockerpty/ + https://pypi.org/project/dockerpty/ +" +SRC_URI=" + https://github.com/d11wtq/dockerpty/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz +" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 arm64" +RDEPEND=" + >=dev-python/six-1.3.0[${PYTHON_USEDEP}] +" BDEPEND=" test? ( >=dev-python/docker-0.7.0_rc2[${PYTHON_USEDEP}] >=dev-python/expects-0.4[${PYTHON_USEDEP}] ) " -RDEPEND=">=dev-python/six-1.3.0[${PYTHON_USEDEP}]" distutils_enable_tests pytest diff --git a/dev-python/dockerpty/metadata.xml b/dev-python/dockerpty/metadata.xml index 6d659e5b3463..cb4c192c716a 100644 --- a/dev-python/dockerpty/metadata.xml +++ b/dev-python/dockerpty/metadata.xml @@ -1,7 +1,11 @@ - + + python@gentoo.org + Python + + d11wtq/dockerpty dockerpty diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest index 1b240bf273a9..520c7d2dd766 100644 --- a/dev-python/docutils/Manifest +++ b/dev-python/docutils/Manifest @@ -1,2 +1,3 @@ DIST docutils-0.19.tar.gz 2056383 BLAKE2B 9983a905642de4e81ca118578671b503ddfda4bef1afcc0524de40543e1f9617fd8d768ef467da49d2f01076683400bad6a0fe15f6b5a3a1e202c42b2e34ab1b SHA512 fb904a899f2b6f3c07c5079577bd7c52a3182cb85f6a4149391e523498df15bfa317f0c04095b890beeb3f89c2b444875a2a609d880ac4d7fbc3125e46b37ea5 DIST docutils-0.20.1.tar.gz 2058365 BLAKE2B 73fb8302599ffe57b0840c898b0b2e3ccd39ff9ea6eec2b5d345d02c950e1a8357bd821e62733b0484e82bc30e71d30fab381390b0edaef4375b02bcd9eeeb40 SHA512 a0ddca315d03677003036d6a8052ac96fbd3fcc4508564938ea684d79bedb4d322d83449c7b26e55b19b0aadd6e46ca9ac409bb16279a20f06c70e9c15ef5eb0 +DIST docutils-0.21.1.tar.gz 2201080 BLAKE2B a89792a69a7faa0eda7b2470e5e3a3d3cf8250a3577553a8f8f8d3d86d2693394e97dca6c75c1b4815748d2ce126ccd3f71dead5763ec8b70aee7be183165473 SHA512 2816fe074b12d7f15fb6730339f3af5f459f50af0cd2a4922194887f48bfd9931c2f2054a17a5418585b586502b96e05ed18600d31c523084537dc72707ab0ee diff --git a/dev-python/docutils/docutils-0.21.1.ebuild b/dev-python/docutils/docutils-0.21.1.ebuild new file mode 100644 index 000000000000..773ff8bded58 --- /dev/null +++ b/dev-python/docutils/docutils-0.21.1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=flit +PYTHON_COMPAT=( python3_{10..12} pypy3 ) + +inherit distutils-r1 optfeature pypi + +DESCRIPTION="Python Documentation Utilities (reference reStructuredText impl.)" +HOMEPAGE=" + https://docutils.sourceforge.io/ + https://pypi.org/project/docutils/ +" + +# GPL-3+ only for emacs/rst.el +LICENSE="BSD BSD-2 GPL-3+ PSF-2.4 public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] +" +BDEPEND=" + ${RDEPEND} +" + +PATCHES=( + # minimal backport of upstream r9637, r9641 + "${FILESDIR}/${P}-test.patch" +) + +python_compile_all() { + # Generate html docs from reStructured text sources. + + # Place html4css1.css in base directory to ensure that the generated reference to it is correct. + cp docutils/writers/html4css1/html4css1.css . || die + + cd tools || die + "${EPYTHON}" buildhtml.py --input-encoding=utf-8 --no-datestamp \ + --stylesheet-path=../html4css1.css, --traceback ../docs || die +} + +src_test() { + cd test || die + mkdir functional/output || die + distutils-r1_src_test +} + +python_test() { + "${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}" +} + +python_install() { + distutils-r1_python_install + + # Install tools. + python_doscript tools/buildhtml.py +} + +install_txt_doc() { + local doc="${1}" + local dir="txt/$(dirname ${doc})" + docinto "${dir}" + dodoc "${doc}" +} + +python_install_all() { + local DOCS=( *.txt ) + local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css ) + + distutils-r1_python_install_all + + local doc + while IFS= read -r -d '' doc; do + install_txt_doc "${doc}" + done < <(find docs tools -name '*.txt' -print0) +} + +pkg_postinst() { + optfeature \ + "auto-detecting the image dimensions when using the 'scale' option" \ + dev-python/pillow +} diff --git a/dev-python/docutils/files/docutils-0.21.1-test.patch b/dev-python/docutils/files/docutils-0.21.1-test.patch new file mode 100644 index 000000000000..507fd239c166 --- /dev/null +++ b/dev-python/docutils/files/docutils-0.21.1-test.patch @@ -0,0 +1,42 @@ +diff --git a/test/test_writers/test_html5_polyglot_parts.py b/test/test_writers/test_html5_polyglot_parts.py +index fb2792ee7..cb03fea2f 100644 +--- a/test/test_writers/test_html5_polyglot_parts.py ++++ b/test/test_writers/test_html5_polyglot_parts.py +@@ -24,11 +24,20 @@ if __name__ == '__main__': + + import docutils + import docutils.core ++from docutils.parsers.rst.directives.images import PIL + from docutils.utils.code_analyzer import with_pygments + + ROOT_PREFIX = (Path(__file__).parent.parent/'functional'/'input').as_posix() + DATA_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', 'data')) + ++with_pygments = False ++PIL_NOT_FOUND_PATH = 'dummy.png' ++try: ++ if PIL and (tuple(int(i) for i in PIL.__version__.split('.')) >= (10, 3)): ++ PIL_NOT_FOUND_PATH = Path('dummy.png').resolve() ++except: ++ PIL = None ++ + + class Html5WriterPublishPartsTestCase(unittest.TestCase): + """Test case for HTML writer via the publish_parts interface.""" +@@ -642,14 +651,14 @@ totest['system_messages'] = ({'stylesheet_path': '', + .. image:: dummy.mp4 + :scale: 100% + """, +-{'fragment': """\ ++{'fragment': f"""\ + dummy.png + +