diff --git a/Manifest.files.gz b/Manifest.files.gz index f3716f226287..ee7116e46155 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 914b751d0c93..616d7db9a4fd 100644 Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ diff --git a/app-accessibility/kontrast/Manifest b/app-accessibility/kontrast/Manifest index c5930a111fec..16b23f65b2e1 100644 --- a/app-accessibility/kontrast/Manifest +++ b/app-accessibility/kontrast/Manifest @@ -1,2 +1,2 @@ DIST kontrast-21.12.3.tar.xz 125760 BLAKE2B b72d78961d22fc0eb51c0a64f9a7381ef9e87709d9fc24a08c3b08c60ad8102eadbc97943e72b1153f950654f442f97190d1e34c3beb24f4f8ea070f923dba55 SHA512 36d084f0801d393a0d7bdd771d23163a192e6d0e50f6499b9080e3928f5f3982dcee81c3e3453f8de2ece721c508479928fdff4a971cfef945acadd917e19581 -DIST kontrast-22.04.2.tar.xz 125844 BLAKE2B e9141894a70489caacc86fdcdc54f7815147871f4ce0c8e90d32b20ca1eac226e1f1b841cf8959e14e2ba5ad681f0b29c81dae72b97b4a10e35e79e63e8a52f2 SHA512 24e814e5b1921deda42df44381c750cbbe1e83e2fe32397e76a0d6d7aeaa2615b92981f5eb357168519ec0cc45ac7b4e0bfd77380dc92c775b5f4845c1f52d3a +DIST kontrast-22.04.3.tar.xz 125860 BLAKE2B 78b87ebfb0958ce7bf2abf7a70ada000f959aa2cd648ebaf70ffef5500458bf1f9c42433176caa1ac29ab5b0ed51452092c796f679d7c56e4188e2a746169a05 SHA512 e77b2b129f115d2cf319a2a5f6b56bc576c00c506b542cc6239098245da17b966a71caf05f0868af7d5f3807be033bfc552b9fd1856046889363d1012bf13efe diff --git a/app-accessibility/kontrast/kontrast-22.04.2.ebuild b/app-accessibility/kontrast/kontrast-22.04.3.ebuild similarity index 98% rename from app-accessibility/kontrast/kontrast-22.04.2.ebuild rename to app-accessibility/kontrast/kontrast-22.04.3.ebuild index ff5f2492ee4a..ca3b51371946 100644 --- a/app-accessibility/kontrast/kontrast-22.04.2.ebuild +++ b/app-accessibility/kontrast/kontrast-22.04.3.ebuild @@ -5,7 +5,7 @@ EAPI=8 KDE_GEAR="true" KFMIN=5.92.0 -QTMIN=5.15.3 +QTMIN=5.15.4 inherit ecm kde.org DESCRIPTION="Tool to check contrast for colors to verify they are correctly accessible" diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest index cef98c821d54..0a3ab3f124dd 100644 --- a/app-accessibility/orca/Manifest +++ b/app-accessibility/orca/Manifest @@ -1,2 +1,3 @@ DIST orca-42.1.tar.xz 3700132 BLAKE2B 1310a1b43da709e9b273ce21374fff9fa30fbf08d1d0e171eb7eff4511ad5e2bcee12a2d6549a4c0c8e21526fb6f4b3b311d0e09fd6bfa863e29168809df9c10 SHA512 98f016087317666c4dcc7543d16ffb93214075d49d3708a1aa3dc8b6dd5d9d85c52dd31e650f4511371061c58d53e73455a09d6d7b4405b8a972b58ff1d7db91 DIST orca-42.2.tar.xz 3707612 BLAKE2B a181c994ee8c35561d493dd00949807c09ccb3dd406ed0c61083c746c29fe7ef9db010484c34ca4416170cf51555b1f595f78816ca5f66ccf29970a0ff447088 SHA512 78c4e6d588d4929869100b761c85aa1d37a503e0960953c6ef7488ac7ed3c6d4ec400b9fd034b5178d64a69aca7daeaac2f25e292c32dfa814f7428b1c159fd5 +DIST orca-42.3.tar.xz 3707048 BLAKE2B b1a03cee97ba2ad17e32b863effba46974f86e5cbdcea72235085e369189e8e92cba8b83931fd83a7b859edfc8da9236f462e250c468ad1533768479eb25aad0 SHA512 59d9d61af2e385d8e356f825fc1733d73d136f89a3a06c352eaf1e7b05cd6ebf5bd13282afb478adb4ea7981398db0138324c3e275eb372b99ba648d9fafeab6 diff --git a/app-accessibility/orca/orca-42.3.ebuild b/app-accessibility/orca/orca-42.3.ebuild new file mode 100644 index 000000000000..b5714207dce1 --- /dev/null +++ b/app-accessibility/orca/orca-42.3.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="threads(+)" + +inherit gnome2 python-single-r1 + +DESCRIPTION="Extensible screen reader that provides access to the desktop" +HOMEPAGE="https://wiki.gnome.org/Projects/Orca" + +LICENSE="LGPL-2.1+ CC-BY-SA-3.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + +IUSE="+braille" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + >=app-accessibility/at-spi2-atk-2.34:2 + >=app-accessibility/at-spi2-core-2.36:2[introspection] + >=dev-libs/atk-2.36 + >=dev-libs/glib-2.28:2 + media-libs/gstreamer:1.0[introspection] + >=x11-libs/gtk+-3.6.2:3[introspection] + $(python_gen_cond_dep ' + dev-python/gst-python:1.0[${PYTHON_USEDEP}] + >=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}] + ') + braille? ( + $(python_gen_cond_dep ' + >=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}] + dev-libs/liblouis[python,${PYTHON_USEDEP}] + ') + ) +" +RDEPEND="${DEPEND} + dev-libs/atk[introspection] + $(python_gen_cond_dep ' + >=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}] + >=dev-python/pyatspi-2.36[${PYTHON_USEDEP}] + dev-python/setproctitle[${PYTHON_USEDEP}] + ') + x11-libs/libwnck:3[introspection] + x11-libs/pango[introspection] +" +BDEPEND=" + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" +# app-text/yelp-tools + +src_configure() { + gnome2_src_configure \ + $(use_with braille liblouis) +} + +src_install() { + gnome2_src_install + python_optimize +} diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index 3cf629d905be..a9e515798ff3 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest index 3e3defa685e8..1824219105cc 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -4,3 +4,4 @@ DIST aws-cli-1.25.20.gh.tar.gz 2227422 BLAKE2B 7dfeb6266578fc61a4fa54f39bbaaabcc DIST aws-cli-1.25.21.gh.tar.gz 2228274 BLAKE2B 3246bcc1607fa7a43cb081192176345c189b8e19c197e22f27396d3dd72f7e55436820010f9245375ddbf4cfc24f13d2fc47864ad34a5dca1529669e91b6bff1 SHA512 26a97d632206016cfba2a8a51949ad623677a04a6582d1f7f28191c02adb39bf8f4b42e22796c3c97c29ae2dc36007803fc25f442111a67f93f3cc8880e50759 DIST aws-cli-1.25.22.gh.tar.gz 2228459 BLAKE2B e9ca58f6be9d5836b2b4d8ce51154ecd9dca3e443a120ff6ab3475b0777ca5e50c17a3c30641c57df1df63cc065fc0316b1e847b695bdfbe49a0a5b330912a74 SHA512 328303792a75c9f44c7e37e825ffb81aa2a071d4ae18b21c31f2c9abc5e0ae8f3ec079725847cd731d4cc49b5064a0244129176789f4ce0865e6d8cae0dda1e8 DIST aws-cli-1.25.23.gh.tar.gz 2229364 BLAKE2B 1610ceba16cc6555b333d1f2869f4c8667a7aecfb28ac21f46ebd1ca9a3f26da78d1f84816a7ec6c279273c5d17ab97e1963a73499c5a648571da0386f715b88 SHA512 8cc030c386b9a3d58ea2ff41d9a8da30f126707db1b9e8397ee676f3f9f4d0c8f74aa840307ba6664508d47e2f73d7fb3fe5090b7d117aab8d8b47b1b3a191eb +DIST aws-cli-1.25.24.gh.tar.gz 2229473 BLAKE2B 2937ca1016052732ff382b70c5a479250a139a9c556f1cf40a2903dac35f8fbe89575b1cd3bf787c23a0cb70ebe87fd7cf3952ce9eef08347c439e30a0efd3dd SHA512 7a0c7b3ac9cc9cedefe72ce9d7004afa5cf4b5cb25826153452fd83fdef89970d286e63c1e47f699b9d8bbe2cd39f7079a2154cd3d1064ecbd6d8b6ab244c9a2 diff --git a/app-admin/awscli/awscli-1.25.24.ebuild b/app-admin/awscli/awscli-1.25.24.ebuild new file mode 100644 index 000000000000..9f176fa05cc8 --- /dev/null +++ b/app-admin/awscli/awscli-1.25.24.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 distutils-r1 multiprocessing + +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 ~arm64 ~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.6.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + !app-admin/awscli-bin +" +BDEPEND=" + test? ( + dev-python/pytest-forked[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +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() { + # integration tests require AWS credentials and Internet access + epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked +} + +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-backup/Manifest.gz b/app-backup/Manifest.gz index 7e236ad1f7ca..849597813209 100644 Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ diff --git a/app-backup/bacula/bacula-11.0.6-r2.ebuild b/app-backup/bacula/bacula-11.0.6-r2.ebuild index 4f6706f68b34..785ae94c4709 100644 --- a/app-backup/bacula/bacula-11.0.6-r2.ebuild +++ b/app-backup/bacula/bacula-11.0.6-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~sparc x86" IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" DEPEND=" diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz index 7dcdce4f800e..15ebbb1a3d04 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 3070803a95ce..9304c475bac5 100644 --- a/app-cdr/dolphin-plugins-mountiso/Manifest +++ b/app-cdr/dolphin-plugins-mountiso/Manifest @@ -1,2 +1,2 @@ DIST dolphin-plugins-21.12.3.tar.xz 254696 BLAKE2B e669a8acbf8b5559a602dd3ae646e2384b89a672bb0ed42d2f094b75a1eaefd6994644daaa70d17f9baba8ea491cef632090050b93e0f5e0b50f203a6166338e SHA512 3dad72b6e0283a8c825aded82e9d15bc5e03303bbfc6dd8f1e6af2cb3892ec9b04a3c97f01246e20abe6d86e5a91fa1c4f8fff48ed24186a3780009a78298d23 -DIST dolphin-plugins-22.04.2.tar.xz 256540 BLAKE2B 97ac9f10e6085705397faacf82dd5787e1f346f9d44e6e310899c6b8c73df103f84c42f55e3a34a844fd29f6539298da71bd96b2d82c5c2fbff56402c079a0b2 SHA512 ec9ede9729194aeeaaefe2d83b219e1b2ee1b9eb8a7b64623bc08d58952adc906469f78d785add05d176461e6104fa806771b74497b8bc3f53c3822b8dedec94 +DIST dolphin-plugins-22.04.3.tar.xz 257356 BLAKE2B e3d084e628920a08c9e1173c754002f6b0ecfad07bd4d89a64f5b29a7e93362a814ead6aeff80412b01e7198adce78c36f36428560a1ea9e555027113f7d8e6f SHA512 1b96511fbf8ec93b03a5f204c2e4cff232ca0d09e4d1599c89d4d514deb3fb889dfd3050a5cabe4e35b6e65a5283ad09635a13931c8484eebc98a22ba9057b42 diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-22.04.2.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-22.04.3.ebuild similarity index 99% rename from app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-22.04.2.ebuild rename to app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-22.04.3.ebuild index d18b4d8d4104..70a3a319442f 100644 --- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-22.04.2.ebuild +++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-22.04.3.ebuild @@ -10,7 +10,7 @@ KDE_ORG_NAME="dolphin-plugins" MY_PLUGIN_NAME="mountiso" KFMIN=5.92.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.3 +QTMIN=5.15.4 inherit ecm kde.org DESCRIPTION="Dolphin plugin for ISO loopback device mounting" diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz index aefc9dd4204c..47edecef9c0f 100644 Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest index 8476da658e84..8bbdc6f80c7f 100644 --- a/app-crypt/acme/Manifest +++ b/app-crypt/acme/Manifest @@ -1,2 +1,3 @@ DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e DIST certbot-1.28.0.tar.gz 1367671 BLAKE2B 01fda6c068217e32273b2c1ac97faa099f98da687d41796e1c98971ed6779ab4ff78e3309b7a6f82b9b0a891c5f00b5201bb3ce1bc879e5acbab3ccc4988ec31 SHA512 888f51dfcf4712b70ce7c99abfc52106384dcba2eef486db8b033bfcca3043bd0beaadce1c1e59f19c3a58b7fe454b2b64774de2e23f5d93579b3e1be1a7c08b +DIST certbot-1.29.0.tar.gz 1367853 BLAKE2B c0d8d2c05a061b2d50564a97bf17ae883bd443321bf99cea13fbae196c7ec876231d803d5389e524997dd8632035d5ad60b1a99b025a22a65d0865d564cfafc5 SHA512 755781e12e0e4cdb41aa16d90ab6a334ef41a98630e08127a867c8e8813ee45ebd3f6f54168fe747900f6ab59539e414ffed7891c05746b3a7af2e2a96a8d522 diff --git a/app-crypt/acme/acme-1.28.0.ebuild b/app-crypt/acme/acme-1.28.0.ebuild index be518d606627..da63ed453043 100644 --- a/app-crypt/acme/acme-1.28.0.ebuild +++ b/app-crypt/acme/acme-1.28.0.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then S=${WORKDIR}/${P}/${PN} else SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" S=${WORKDIR}/certbot-${PV}/acme fi diff --git a/app-crypt/acme/acme-1.29.0.ebuild b/app-crypt/acme/acme-1.29.0.ebuild new file mode 100644 index 000000000000..a905a81b75cc --- /dev/null +++ b/app-crypt/acme/acme-1.29.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + inherit git-r3 + S=${WORKDIR}/${P}/${PN} +else + SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + S=${WORKDIR}/certbot-${PV}/acme +fi + +DESCRIPTION="An implementation of the ACME protocol" +HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" + +LICENSE="Apache-2.0" +SLOT="0" + +RDEPEND=" + dev-python/chardet[${PYTHON_USEDEP}] + >=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}] + >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}] + dev-python/pyrfc3339[${PYTHON_USEDEP}] + >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] + >=dev-python/requests-2.20.0[${PYTHON_USEDEP}] + >=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}] +" + +distutils_enable_sphinx docs dev-python/sphinx_rtd_theme +distutils_enable_tests pytest diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild index be518d606627..a905a81b75cc 100644 --- a/app-crypt/acme/acme-9999.ebuild +++ b/app-crypt/acme/acme-9999.ebuild @@ -28,7 +28,7 @@ RDEPEND=" dev-python/chardet[${PYTHON_USEDEP}] >=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}] >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}] dev-python/pyrfc3339[${PYTHON_USEDEP}] >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] >=dev-python/requests-2.20.0[${PYTHON_USEDEP}] diff --git a/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild b/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild new file mode 100644 index 000000000000..2af122979701 --- /dev/null +++ b/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs udev + +MY_P=ACR38_LINUX_$(ver_cut 1)00$(ver_cut 2)$(ver_cut 3)_P + +SLOT="0" +LICENSE="LGPL-2.1" +KEYWORDS="~amd64 ~x86" +DESCRIPTION="Non CCID driver for ACR38 AC1038-based Smart Card Reader" + +#SRC_URI="http://www.acs.com.hk/drivers/eng/${MY_P}.tar.bz2" +# tarball release is encapsuled in a .zip file :-( +# http://www.acs.com.hk/drivers/eng/ACR38_Driver_Lnx_101_P.zip +# This drivers is not maintained by ACS anymore. +SRC_URI="https://www.linuxunderground.be/${MY_P}.tar.bz2" +HOMEPAGE="https://www.acs.com.hk" + +# Make this safe from collisions, require a version of pcsc-lite that +# uses libusb-1.0 and use the wrapper library instead. +# Changed back from dev-libs/libusb-compat to virtual/libusb:0 because +# libusb-compat is marked stable and primary in the virtual. -ssuominen +RDEPEND=">=sys-apps/pcsc-lite-1.6.4 + virtual/libusb:0" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${P}-build.patch +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die + + # note: for eudev support this pkg may always need to install rules to /usr + udev_newrules "${FILESDIR}/${PV}-bis.rules" 92-pcscd-acr38u.rules +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest index 8476da658e84..8bbdc6f80c7f 100644 --- a/app-crypt/certbot-apache/Manifest +++ b/app-crypt/certbot-apache/Manifest @@ -1,2 +1,3 @@ DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e DIST certbot-1.28.0.tar.gz 1367671 BLAKE2B 01fda6c068217e32273b2c1ac97faa099f98da687d41796e1c98971ed6779ab4ff78e3309b7a6f82b9b0a891c5f00b5201bb3ce1bc879e5acbab3ccc4988ec31 SHA512 888f51dfcf4712b70ce7c99abfc52106384dcba2eef486db8b033bfcca3043bd0beaadce1c1e59f19c3a58b7fe454b2b64774de2e23f5d93579b3e1be1a7c08b +DIST certbot-1.29.0.tar.gz 1367853 BLAKE2B c0d8d2c05a061b2d50564a97bf17ae883bd443321bf99cea13fbae196c7ec876231d803d5389e524997dd8632035d5ad60b1a99b025a22a65d0865d564cfafc5 SHA512 755781e12e0e4cdb41aa16d90ab6a334ef41a98630e08127a867c8e8813ee45ebd3f6f54168fe747900f6ab59539e414ffed7891c05746b3a7af2e2a96a8d522 diff --git a/app-crypt/certbot-apache/certbot-apache-1.28.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.28.0.ebuild index cf0c9621b1ae..85b55229a0d2 100644 --- a/app-crypt/certbot-apache/certbot-apache-1.28.0.ebuild +++ b/app-crypt/certbot-apache/certbot-apache-1.28.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then S=${WORKDIR}/${P}/${PN} else SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 x86" S=${WORKDIR}/${PN%-apache}-${PV}/${PN} fi diff --git a/app-crypt/certbot-apache/certbot-apache-1.29.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.29.0.ebuild new file mode 100644 index 000000000000..4a5e9753518c --- /dev/null +++ b/app-crypt/certbot-apache/certbot-apache-1.29.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + inherit git-r3 + S=${WORKDIR}/${P}/${PN} +else + SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" + S=${WORKDIR}/${PN%-apache}-${PV}/${PN} +fi + +inherit distutils-r1 + +DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)" +HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" + +LICENSE="Apache-2.0" +SLOT="0" + +RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}] + >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] + dev-python/python-augeas[${PYTHON_USEDEP}] + dev-python/zope-component[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild index b46b10fa3536..4a5e9753518c 100644 --- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild +++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_USE_SETUPTOOLS=rdepend diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest index 8476da658e84..8bbdc6f80c7f 100644 --- a/app-crypt/certbot-nginx/Manifest +++ b/app-crypt/certbot-nginx/Manifest @@ -1,2 +1,3 @@ DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e DIST certbot-1.28.0.tar.gz 1367671 BLAKE2B 01fda6c068217e32273b2c1ac97faa099f98da687d41796e1c98971ed6779ab4ff78e3309b7a6f82b9b0a891c5f00b5201bb3ce1bc879e5acbab3ccc4988ec31 SHA512 888f51dfcf4712b70ce7c99abfc52106384dcba2eef486db8b033bfcca3043bd0beaadce1c1e59f19c3a58b7fe454b2b64774de2e23f5d93579b3e1be1a7c08b +DIST certbot-1.29.0.tar.gz 1367853 BLAKE2B c0d8d2c05a061b2d50564a97bf17ae883bd443321bf99cea13fbae196c7ec876231d803d5389e524997dd8632035d5ad60b1a99b025a22a65d0865d564cfafc5 SHA512 755781e12e0e4cdb41aa16d90ab6a334ef41a98630e08127a867c8e8813ee45ebd3f6f54168fe747900f6ab59539e414ffed7891c05746b3a7af2e2a96a8d522 diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.28.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.28.0.ebuild index e66a6b39887e..3566b27d06f7 100644 --- a/app-crypt/certbot-nginx/certbot-nginx-1.28.0.ebuild +++ b/app-crypt/certbot-nginx/certbot-nginx-1.28.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then S=${WORKDIR}/${P}/${PN} else SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" S=${WORKDIR}/${PN%-nginx}-${PV}/${PN} fi diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.29.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.29.0.ebuild new file mode 100644 index 000000000000..7eeac389284d --- /dev/null +++ b/app-crypt/certbot-nginx/certbot-nginx-1.29.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + inherit git-r3 + S=${WORKDIR}/${P}/${PN} +else + SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + S=${WORKDIR}/${PN%-nginx}-${PV}/${PN} +fi + +inherit distutils-r1 + +DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)" +HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +RDEPEND=" + >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] + >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}] + >=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild index e66a6b39887e..7eeac389284d 100644 --- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild +++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_USE_SETUPTOOLS=rdepend @@ -28,7 +28,7 @@ IUSE="" RDEPEND=" >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}] >=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}]" diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest index 8476da658e84..8bbdc6f80c7f 100644 --- a/app-crypt/certbot/Manifest +++ b/app-crypt/certbot/Manifest @@ -1,2 +1,3 @@ DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e DIST certbot-1.28.0.tar.gz 1367671 BLAKE2B 01fda6c068217e32273b2c1ac97faa099f98da687d41796e1c98971ed6779ab4ff78e3309b7a6f82b9b0a891c5f00b5201bb3ce1bc879e5acbab3ccc4988ec31 SHA512 888f51dfcf4712b70ce7c99abfc52106384dcba2eef486db8b033bfcca3043bd0beaadce1c1e59f19c3a58b7fe454b2b64774de2e23f5d93579b3e1be1a7c08b +DIST certbot-1.29.0.tar.gz 1367853 BLAKE2B c0d8d2c05a061b2d50564a97bf17ae883bd443321bf99cea13fbae196c7ec876231d803d5389e524997dd8632035d5ad60b1a99b025a22a65d0865d564cfafc5 SHA512 755781e12e0e4cdb41aa16d90ab6a334ef41a98630e08127a867c8e8813ee45ebd3f6f54168fe747900f6ab59539e414ffed7891c05746b3a7af2e2a96a8d522 diff --git a/app-crypt/certbot/certbot-1.28.0.ebuild b/app-crypt/certbot/certbot-1.28.0.ebuild index e705aa1d52ec..3b7237a33e98 100644 --- a/app-crypt/certbot/certbot-1.28.0.ebuild +++ b/app-crypt/certbot/certbot-1.28.0.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" fi S=${WORKDIR}/${P}/${PN} diff --git a/app-crypt/certbot/certbot-1.29.0.ebuild b/app-crypt/certbot/certbot-1.29.0.ebuild new file mode 100644 index 000000000000..3d098ba0560b --- /dev/null +++ b/app-crypt/certbot/certbot-1.29.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + inherit git-r3 +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +fi +S=${WORKDIR}/${P}/${PN} + +inherit distutils-r1 + +DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates" +HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" + +LICENSE="Apache-2.0" +SLOT="0" + +IUSE="selinux" + +RDEPEND=" + >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] + >=dev-python/ConfigArgParse-0.9.3[${PYTHON_USEDEP}] + >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}] + >=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}] + >=dev-python/distro-1.0.1[${PYTHON_USEDEP}] + >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}] + >=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}] + dev-python/pyrfc3339[${PYTHON_USEDEP}] + >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] + dev-python/zope-component[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] + selinux? ( sec-policy/selinux-certbot )" + +distutils_enable_tests pytest diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild index e705aa1d52ec..3d098ba0560b 100644 --- a/app-crypt/certbot/certbot-9999.ebuild +++ b/app-crypt/certbot/certbot-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_USE_SETUPTOOLS=rdepend diff --git a/app-crypt/gnupg/gnupg-2.2.35-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.35-r1.ebuild index 871d49d75a40..d78daa145003 100644 --- a/app-crypt/gnupg/gnupg-2.2.35-r1.ebuild +++ b/app-crypt/gnupg/gnupg-2.2.35-r1.ebuild @@ -16,7 +16,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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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-editors/Manifest.gz b/app-editors/Manifest.gz index fe5f45407293..f439e330586e 100644 Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest index 71141ee46033..f99aa53d90d6 100644 --- a/app-editors/okteta/Manifest +++ b/app-editors/okteta/Manifest @@ -1,3 +1,2 @@ DIST okteta-0.26.7.tar.xz 983388 BLAKE2B abe5abb678c0cae7538ac5bdf68b3e9285c405996194e03dcb3f74c397124805496a67ee1b9b2d8c2676dc3fca7d743a012898056aef82f5f1a1e998ee36ef60 SHA512 829294e0ed8b01be940b215334d9291bba1af01fded05511be33a813e9d090bc06f0af90dfb49d45d44814ae38de7c9cb6427215ea076b8401a66734aa42ea25 -DIST okteta-0.26.8.tar.xz 980328 BLAKE2B f8cdc9246c24c922f3f5b7dd659d3d00c3db58682a7d00d4b5f19d84ec1b376d5a72b0ab548698f44bd34018897bc7aec30874a8bbdf37c1ee9832737519a51b SHA512 1e6cd6c0386573b13cc107ec735dc9319860cbb458b8fe72773a50005b3327cd0257b5d9fc5b3bee1cdaddc12accb9106b2ce566fdbbc1f698617a4ff4b5c5f6 DIST okteta-0.26.9.tar.xz 990484 BLAKE2B 97430ed8a5c8dda422dfd43a91c04fe778581caf475c74b324a26d772777030d73ed799dafa6662b225258ae76c1c37bd38c7d3c97d89d28928106d10f84308a SHA512 cc98f7923a26de9548944ebc207284879607707f41065c847707ac5876c04d31926bb4edf82062cd4d6ade2df64d7a2363d8dfa711524574514ca0dd260b4a9f diff --git a/app-editors/okteta/okteta-0.26.8.ebuild b/app-editors/okteta/okteta-0.26.8.ebuild deleted file mode 100644 index cf8171388a8d..000000000000 --- a/app-editors/okteta/okteta-0.26.8.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -KFMIN=5.82.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Hex editor by KDE" -HOMEPAGE="https://apps.kde.org/okteta/ https://utils.kde.org/projects/okteta/" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -fi - -LICENSE="GPL-2 handbook? ( FDL-1.2 )" -SLOT="5" -IUSE="crypt" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtscript-${QTMIN}:5[scripttools] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - crypt? ( >=app-crypt/qca-2.3.0:2 ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DOMIT_EXAMPLES=ON - $(cmake_use_find_package crypt Qca-qt5) - ) - - ecm_src_configure -} - -src_test() { - local myctestargs=( -j1 ) - - ecm_src_test -} diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest index bf14412cb3bd..6a58a2212764 100644 --- a/app-editors/vim-core/Manifest +++ b/app-editors/vim-core/Manifest @@ -1,3 +1,4 @@ DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9 +DIST vim-8.2.5066-gentoo-patches.tar.xz 2628 BLAKE2B 637a4076f82b858ce61cbb46623d3440a4f65d851830cab8b5d938feab79fb37ec31ef6609931c44cc7245cdccb11e45c3e8536afd23ac43ed4af08f33f248ad SHA512 7ed4fe7e8e1236e6b37543797205817266f5c9c482e25b877a522910ec8e2e6a5235502d062c32b6fa95e508ef84f127af7831d4ed2b1544453f2cf7b560da18 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e diff --git a/app-editors/vim-core/vim-core-8.2.5066.ebuild b/app-editors/vim-core/vim-core-8.2.5066-r1.ebuild similarity index 97% rename from app-editors/vim-core/vim-core-8.2.5066.ebuild rename to app-editors/vim-core/vim-core-8.2.5066-r1.ebuild index 3663d9c774fc..2ab640fe7da3 100644 --- a/app-editors/vim-core/vim-core-8.2.5066.ebuild +++ b/app-editors/vim-core/vim-core-8.2.5066-r1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]] ; then EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" + https://dev.gentoo.org/~mattst88/distfiles/vim-8.2.5066-gentoo-patches.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi S="${WORKDIR}"/vim-${PV} @@ -44,8 +44,6 @@ pkg_setup() { src_prepare() { if [[ ${PV} != 9999* ]] ; then - rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || die - # Gentoo patches to fix runtime issues, cross-compile errors, etc eapply "${WORKDIR}"/patches fi @@ -82,7 +80,7 @@ src_prepare() { # which isn't even in the source file being invalid, we'll do some trickery # to make the error never occur. bug 66162 (02 October 2004 ciaranm) find "${S}" -name '*.c' | while read c; do - echo >> "$c" || die "echo failed" + echo >> "$c" || die "echo failed" done # Try to avoid sandbox problems. Bug #114475. diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index 3663d9c774fc..2ab640fe7da3 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]] ; then EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" + https://dev.gentoo.org/~mattst88/distfiles/vim-8.2.5066-gentoo-patches.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi S="${WORKDIR}"/vim-${PV} @@ -44,8 +44,6 @@ pkg_setup() { src_prepare() { if [[ ${PV} != 9999* ]] ; then - rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || die - # Gentoo patches to fix runtime issues, cross-compile errors, etc eapply "${WORKDIR}"/patches fi @@ -82,7 +80,7 @@ src_prepare() { # which isn't even in the source file being invalid, we'll do some trickery # to make the error never occur. bug 66162 (02 October 2004 ciaranm) find "${S}" -name '*.c' | while read c; do - echo >> "$c" || die "echo failed" + echo >> "$c" || die "echo failed" done # Try to avoid sandbox problems. Bug #114475. diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index bf14412cb3bd..6a58a2212764 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -1,3 +1,4 @@ DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9 +DIST vim-8.2.5066-gentoo-patches.tar.xz 2628 BLAKE2B 637a4076f82b858ce61cbb46623d3440a4f65d851830cab8b5d938feab79fb37ec31ef6609931c44cc7245cdccb11e45c3e8536afd23ac43ed4af08f33f248ad SHA512 7ed4fe7e8e1236e6b37543797205817266f5c9c482e25b877a522910ec8e2e6a5235502d062c32b6fa95e508ef84f127af7831d4ed2b1544453f2cf7b560da18 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e diff --git a/app-editors/vim/vim-8.2.5066.ebuild b/app-editors/vim/vim-8.2.5066-r1.ebuild similarity index 98% rename from app-editors/vim/vim-8.2.5066.ebuild rename to app-editors/vim/vim-8.2.5066-r1.ebuild index 0afdaaef7172..bcec32097911 100644 --- a/app-editors/vim/vim-8.2.5066.ebuild +++ b/app-editors/vim/vim-8.2.5066-r1.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]] ; then EGIT_REPO_URI="https://github.com/vim/vim.git" else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" + https://dev.gentoo.org/~mattst88/distfiles/vim-8.2.5066-gentoo-patches.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -80,8 +80,6 @@ pkg_setup() { src_prepare() { if [[ ${PV} != 9999* ]] ; then - rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || die - # Gentoo patches to fix runtime issues, cross-compile errors, etc eapply "${WORKDIR}"/patches/ fi @@ -120,7 +118,7 @@ src_prepare() { # which isn't even in the source file being invalid, we'll do some trickery # to make the error never occur. bug 66162 (02 October 2004 ciaranm) find "${S}" -name '*.c' | while read c; do - echo >> "$c" || die "echo failed" + echo >> "$c" || die "echo failed" done # conditionally make the manpager.sh script diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index 0afdaaef7172..bcec32097911 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]] ; then EGIT_REPO_URI="https://github.com/vim/vim.git" else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" + https://dev.gentoo.org/~mattst88/distfiles/vim-8.2.5066-gentoo-patches.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -80,8 +80,6 @@ pkg_setup() { src_prepare() { if [[ ${PV} != 9999* ]] ; then - rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || die - # Gentoo patches to fix runtime issues, cross-compile errors, etc eapply "${WORKDIR}"/patches/ fi @@ -120,7 +118,7 @@ src_prepare() { # which isn't even in the source file being invalid, we'll do some trickery # to make the error never occur. bug 66162 (02 October 2004 ciaranm) find "${S}" -name '*.c' | while read c; do - echo >> "$c" || die "echo failed" + echo >> "$c" || die "echo failed" done # conditionally make the manpager.sh script diff --git a/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch b/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch new file mode 100644 index 000000000000..8b5443dfcb10 --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch @@ -0,0 +1,115 @@ +diff -u b/lisp/update-elc-2.el b/lisp/update-elc-2.el +--- b/lisp/update-elc-2.el Mon Jun 27 22:14:53 2022 +0900 ++++ b/lisp/update-elc-2.el Thu Jun 30 16:36:19 2022 +0100 +@@ -144,12 +144,12 @@ + (load (expand-file-name "auto-autoloads" lisp-directory)) + (when (featurep 'mule) + (load (expand-file-name "mule/auto-autoloads" lisp-directory))) ++ (when (featurep 'modules) ++ (load (expand-file-name "auto-autoloads" module-directory))) + ;; We remove all the bad .elcs before any byte-compilation, because + ;; there may be dependencies between one .el and another (even across + ;; directories), and we don't want to load an out-of-date .elc while + ;; byte-compiling a file. +- (when (featurep 'modules) +- (load (expand-file-name "auto-autoloads" module-directory))) + (message "Removing old or spurious .elcs in directory tree `%s'..." dir) + (do-update-elc-2 dir nil nil) + (message "Removing old or spurious .elcs in directory tree `%s'...done" +unchanged: +--- a/src/Makefile.in.in Mon Jun 27 13:31:39 2022 +0100 ++++ b/src/Makefile.in.in Mon Jun 27 22:14:53 2022 +0900 +@@ -95,7 +95,12 @@ + SHELL=/bin/sh + RM = rm -f + +-LISP = $(SRC)/../lisp ++## Earlier versions had $(SRC)/../lisp here, but currently ../lisp is a ++## link to $(SRC)/../lisp in out-of-source builds. $(SRC)/../lisp breaks ++## the modules build because the autoloads end up in $(SRCMODULES), but ++## update-elc-2.el looks for them in $(BLDMODULES). ++LISP = ../lisp ++ + ETC = $(SRC)/../etc + SRCMODULES = $(SRC)/../modules + LIB_SRC = ../lib-src +@@ -944,10 +949,14 @@ + -$(RM) $(RAW_EXE) $(DUMP_TARGET) $(DUMP_TARGET).dmp $(LIB_SRC)/DOC + ## Remove the generated load files here; they cause lots of problems + ## when they don't work right. ++## Some older versions tried to put module load files in the SRC tree, ++## but that breaks module builds, which expect them in the BLD tree, ++## and that's where they belong anyway. Clean both. + clean: mostlyclean versionclean + -$(RM) libextcli* $(LISP)/auto-autoloads.el* $(LISP)/custom-load.el* \ + $(LISP)/mule/auto-autoloads.el* $(LISP)/mule/custom-load.el* \ +- $(SRCMODULES)/auto-autoloads.el* $(SRCMODULES)/custom-load.el* ++ $(SRCMODULES)/auto-autoloads.el* $(SRCMODULES)/custom-load.el* \ ++ $(BLDMODULES)/auto-autoloads.el* $(BLDMODULES)/custom-load.el* + ## This is used in making a distribution. + ## Do not use it on development directories! + distclean-noconfig: clean +only in patch2: +unchanged: +--- a/lisp/update-elc.el ++++ b/lisp/update-elc.el +@@ -87,8 +87,8 @@ + + (defvar source-lisp-mule (expand-file-name "mule" source-lisp)) + (defvar source-directory (expand-file-name ".." source-lisp)) +-(defconst module-directory (expand-file-name "modules" source-directory)) +- ++(defvar source-modules (expand-file-name "../modules" (file-truename source-lisp))) ++(defconst module-directory (expand-file-name "modules" build-directory)) + (defvar aa-lisp (expand-file-name "auto-autoloads.el" source-lisp)) + (defvar aac-lisp (expand-file-name "auto-autoloads.elc" source-lisp)) + (defvar aa-lisp-mule (expand-file-name "auto-autoloads.el" source-lisp-mule)) +@@ -280,15 +280,13 @@ If any of these files are changed, we need to redump.") + + ;; Check for the module autoloads separately, given the need to run + ;; directory-files on subdirectories. +- (let ((autoload-file +- (expand-file-name "auto-autoloads.el" module-directory))) +- (mapc +- #'(lambda (full-dir) +- (mapc #'(lambda (full-arg) +- (when (file-newer-than-file-p full-arg autoload-file) +- (setq need-to-rebuild-module-autoloads t))) +- (directory-files full-dir t "\\.c$" nil t))) +- (directory-files module-directory t nil t 'subdirs))) ++ (mapc ++ #'(lambda (full-dir) ++ (mapc #'(lambda (full-arg) ++ (when (file-newer-than-file-p full-arg aa-modules) ++ (setq need-to-rebuild-module-autoloads t))) ++ (directory-files full-dir t "\\.c$" nil t))) ++ (directory-files source-modules t nil t 'subdirs)) + + (if dump-target-out-of-date-wrt-dump-files + (condition-case nil +@@ -346,9 +344,22 @@ If any of these files are changed, we need to redump.") + (if need-to-rebuild-mule-autoloads + (list "-f" "batch-update-directory-autoloads" + "mule" source-lisp-mule)) +- (if need-to-rebuild-module-autoloads +- (list "-f" "batch-update-directory-autoloads" +- "auto" module-directory)) ++ (if need-to-rebuild-module-autoloads ++ (list "-eval" ++ (concat ++ "(update-autoload-files '(" ++ (mapconcat #'prin1-to-string ++ (mapcan ++ #'(lambda (full-dir) ++ (unless (member* ++ (file-name-nondirectory full-dir) ++ '("." "..") :test #'equal) ++ (directory-files full-dir ++ t "\\.c$" nil t))) ++ (directory-files source-modules ++ t nil t 'subdirs)) ++ " ") ++ ") \"modules\" " (prin1-to-string aa-modules) ")"))) + (if need-to-recompile-autoloads + (list "-f" "batch-byte-compile-one-file" + aa-lisp)) diff --git a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild index cbf425e1c83b..e6c5da2b2155 100644 --- a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild +++ b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild @@ -69,6 +69,7 @@ src_prepare() { eapply "${FILESDIR}/${P}-process-test-qa.patch" eapply "${FILESDIR}/${P}-autoloads-parallell-make.patch" eapply "${FILESDIR}/${P}-no-lock-on-finder-inf.patch" + eapply "${FILESDIR}/${P}-module-autoloads.patch" eapply_user diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz index 55f525001c46..d2260df76397 100644 Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ diff --git a/app-emacs/bbdb/Manifest b/app-emacs/bbdb/Manifest index 4960e859fed3..f7ae4130f084 100644 --- a/app-emacs/bbdb/Manifest +++ b/app-emacs/bbdb/Manifest @@ -1,2 +1,3 @@ DIST bbdb-3.1.2.tar.gz 378935 BLAKE2B 3fc862d2d68632c997e3f250aa82cced743c3cc3861c74789bb12015ab99745270c79722dc0342334b90f4dd9071ef809ab670a342ac227c24a927870907c25c SHA512 8b32baadc4eb06b0abf533ccb1f540f4f407f27b8d2e847ae25e62d1405e1de5cfc6af16368eecd4086f281ee7a4016cf25568847b3cb798156c7e18e1912576 DIST bbdb-3.2.2a.tar.gz 198749 BLAKE2B 9f9bf9eb1414f66e19ab4e0771275cb15716257019063874000adfd3de56d047f531c440f585def481c79bf69b06b2fa1edb5b6f42ad0619bfb44318fdde9a3c SHA512 767aa7a046a9456dbf0b622a6efabe5c1d87c0022507b3bb6bec07be54e57a7285a9fe39f870599a248d5e78883300de870c168dc9918c2d1a139ef31fd53ac8 +DIST bbdb-3.2.2b.tar.gz 199518 BLAKE2B d6eef625636689d204ed9c6c7f299380924da5b021118e70930ab3b928d547b9cbb5a1cec8d111ce52678fc44b30ee34d164f46a9c6afa98c829ba871382acef SHA512 f730b911d16484c3723f6983b94784a828173797f4732c8d8eb47d50186415e0fdfde62f4f5f5b5b6ac66b78580fcfb2a398840935400fddd5f8143831e35fe2 diff --git a/app-emacs/bbdb/bbdb-3.2.2b.ebuild b/app-emacs/bbdb/bbdb-3.2.2b.ebuild new file mode 100644 index 000000000000..f166a51d8054 --- /dev/null +++ b/app-emacs/bbdb/bbdb-3.2.2b.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit elisp autotools + +DESCRIPTION="The Insidious Big Brother Database" +HOMEPAGE="https://savannah.nongnu.org/projects/bbdb/" +SRC_URI="https://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/${P}.tar.gz" + +LICENSE="GPL-3+ FDL-1.3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +IUSE="doc tex vm wanderlust" +RESTRICT="test" #631700 + +RDEPEND="vm? ( app-emacs/vm ) + wanderlust? ( app-emacs/wanderlust )" +DEPEND="${RDEPEND}" +BDEPEND="sys-apps/texinfo + doc? ( virtual/texi2dvi )" +IDEPEND="tex? ( virtual/latex-base )" + +SITEFILE="50${PN}-gentoo-3.2.el" +TEXMF="/usr/share/texmf-site" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \ + "$(use_with vm vm-dir "${EPREFIX}${SITELISP}/vm")" \ + "$(use_with wanderlust wl-dir "${EPREFIX}${SITELISP}/wl")" +} + +src_compile() { + emake -C lisp + emake -C doc info $(usev doc pdf) +} + +src_install() { + emake -C lisp DESTDIR="${D}" install + emake -C doc DESTDIR="${D}" install-info $(usev doc install-pdf) + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + dodoc AUTHORS ChangeLog NEWS README TODO + + if use tex; then + insinto "${TEXMF}"/tex/latex/${PN} + doins tex/bbdb.sty + fi +} + +pkg_postinst() { + elisp-site-regen + use tex && texconfig rehash +} + +pkg_postrm() { + elisp-site-regen + use tex && texconfig rehash +} diff --git a/app-emacs/evil/evil-1.14.2.ebuild b/app-emacs/evil/evil-1.14.2.ebuild index b81cd5a8431d..47eafb05cf83 100644 --- a/app-emacs/evil/evil-1.14.2.ebuild +++ b/app-emacs/evil/evil-1.14.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/emacs-evil/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3+ FDL-1.3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RESTRICT="test" RDEPEND=">=app-emacs/undo-tree-0.6.3" diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest index 0159d525f625..9fb5d438b3c2 100644 --- a/app-emacs/nxml-gentoo-schemas/Manifest +++ b/app-emacs/nxml-gentoo-schemas/Manifest @@ -1,2 +1 @@ -DIST nxml-gentoo-schemas-20220125.tar.xz 8644 BLAKE2B 6f2bb618bb94f9a61ba22526161d8b0457d6177b2a6dc339199fe633652ce1138125d50bc1b681117e8dfedb227ec54e30a51d4724fb5148ab31e1224b16fc9e SHA512 95719c92d9c6c9c883c022baf0593f927b0f24f7e35832ab0dd951fb31fd601888715671a6b8a887464649632bce3c8cb8281aa5d5a066fc115d38ffed8f8adb DIST nxml-gentoo-schemas-20220525.tar.xz 8836 BLAKE2B 5506f976b43218d5bb85ae96c31137c51691cef5f3a524d4214584cc0cb1dae26f45b97d636c8361ec06e7bff5cbf2337b8ed82795aba72dd079127db2238ece SHA512 7df23a9d73a09fc26c6e38665d28c3b633d371bf9c84d56b9318045d80ccab23c3b9c115d68efd6733b9048918118612a05405a1a590b41eac4fb7405746b34e diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220125.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220125.ebuild deleted file mode 100644 index 8668c193acfb..000000000000 --- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220125.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit elisp - -DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas" -HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/" -SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" - -LICENSE="HPND MIT GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" - -SITEFILE="60${PN}-gentoo.el" - -src_compile() { :; } - -src_install() { - insinto "${SITEETC}/${PN}" - doins schemas.xml *.rnc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" -} diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220525.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220525.ebuild index e59b183875b9..3e5cb28865fe 100644 --- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220525.ebuild +++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220525.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" LICENSE="MIT GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" SITEFILE="60${PN}-gentoo.el" diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index a553d8a069ba..9dcc1fb9ac04 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index 448d9c3a557e..bfa4bb3f3f57 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -11,5 +11,7 @@ DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 7c3e3bb066505f9838cd7c56d85debc64e5ed32c DIST xen-4.15.3.tar.gz 40793144 BLAKE2B 33932d855a0502cfe2768a7c8ae19d7da285d70b4970d96fd703daf0ee24a77ad47a3d1b4bcf5f465aa81aa7eb7f9295bce96302b2149ca208fa662cd966d6af SHA512 c25903cc263891885ec76500488405226c8e025bb461d2bf0d590b9bd2d7ca5c2693de7ecc38b3655bfd6793cc96314826559f14a09cc139de8cfdbeb914cbd3 DIST xen-4.16.1.tar.gz 44964667 BLAKE2B 190d9c330b5dcdd47bae26b6ef42111c9c63b71b8b92e20eae268054c6b40aaabadef78c0c9634cb3c3b1bde32a746cbb1404b5eed2a82ab829ba10632103856 SHA512 eeabba9c263cd2425bca083e32b5ebfc6c716c00553759c144fd4b6f64a89836b260787fa25ba22c1f5c4ea65aaad7c95b8c2c1070d3377b1c43c9517aa7032a DIST xen-gentoo-patches-23.tar.xz 20536 BLAKE2B 0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5 SHA512 09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49 +DIST xen-gentoo-patches-4.15.3-gentoo-patchset-2.tar.bz2 4681 BLAKE2B 59fe5c2d5f3b975f281778ee96f8771debde7ae738636fc8294e7e2578dffc40938d8c48e4e94f0341762b2ba8e1b6769f71b7783322fb3b2a0a187bbf2b5104 SHA512 8540aa3631277fb652f90c53f6f5b4e9d119a7ed267dec96d7aecca4eac2c465ec3be32b0b82057e79f858cc8115bfdfbf2af5c4879a0be3f98ed68cbe64fdae DIST xen-gentoo-patches-4.16.1-gentoo-patchset-0.tar.gz 5289 BLAKE2B 4946056ee631ec0fa4d29f1cd643f66b491ef3ea049755d10d7b8e189f02816b990e53bffbeeeae0a61fb4e20aa877f5903a8aadfb26d0c78566a0e9fde540c7 SHA512 59d4101879bd18e828349db3814a9082b85c5ba8203ce98e5082491a9ede9c832a02ac7e4d7a0a51a52e38b72e5cce1eea6a09d6c5202e96bfe2aa4d47e12e65 -DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.gz 46026 BLAKE2B 57bca21962c9a451316f486f5db94e9c1b98b5e029a15dbd702007d573fe02571e648866c9ddbc293e53ceb5de92122b13d21e28c8879d918129134725c9ff91 SHA512 f665640fc686dfc5f718531601f66e3f30c4c8c7cb78293b6a615fe9f53a3763f2c864642a19336bb077d432b776ab1c9fa39e6fa5857ca3360e4d1b1ce63f50 +DIST xen-gentoo-patches-4.16.1-gentoo-patchset-1.tar.bz2 4351 BLAKE2B 1ba306fbc4a55aa1fea71139f7a900c8c363cf948f34a2aabd1ff6f8a68f2e632154ea0e0289580c84328b372c4f8cfdb2879bc63ae3ec163bfb29487783a758 SHA512 8d8198fbf8d9d4b46a83cf46c965448cb47b30438518a70c9b552c7cd1b23616e50f615206ddb18603e8482d19b25ccb611904c404d445898928ecf88051b70d +DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.bz2 40645 BLAKE2B 198beb134604b221bc81fb4d32daec074a7c088c7f9bf99c2a9e98bdab2d8bf7e10c0fea9106d039de255fb209a8ac2955d1e724325a5016e6ecbdd94fbb9584 SHA512 d849418fb215a5bb9ea31ea03de6fbb8b1834d9a8e9face0bd3f20ab7bbd3a17cb13e9b3b653a3a5f06fad609b01dbcaa16f7377ead015a9d97cb8f960d0de49 diff --git a/app-emulation/xen-tools/xen-tools-4.15.3.ebuild b/app-emulation/xen-tools/xen-tools-4.15.3.ebuild index 0a779bde587e..60ce532a0998 100644 --- a/app-emulation/xen-tools/xen-tools-4.15.3.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.15.3.ebuild @@ -24,7 +24,7 @@ else IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb" XEN_PRE_PATCHSET_NUM= - XEN_GENTOO_PATCHSET_NUM=0 + XEN_GENTOO_PATCHSET_NUM=2 XEN_PRE_VERSION_BASE= XEN_BASE_PV="${PV}" @@ -46,13 +46,13 @@ else if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}" XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}" - SRC_URI+=" https://github.com/Flowdalic/xen-upstream-patches/archive/refs/tags/${XEN_UPSTREAM_PATCHES_TAG}.tar.gz -> ${XEN_UPSTREAM_PATCHES_NAME}.tar.gz" + SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2" XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}" fi if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then - XEN_GENTOO_PATCHES_TAG="4.16.1-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}" + XEN_GENTOO_PATCHES_TAG="${PV}-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}" XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}" - SRC_URI+=" https://github.com/Flowdalic/xen-gentoo-patches/archive/refs/tags/${XEN_GENTOO_PATCHES_TAG}.tar.gz -> ${XEN_GENTOO_PATCHES_NAME}.tar.gz" + SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2" XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}" fi fi @@ -236,16 +236,18 @@ src_prepare() { fi if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then - rm "${XEN_GENTOO_PATCHES_DIR}"/xen-tools-4.16.0-qemu-bridge.patch || die - sed -i 's/qemu-bridge-helper/xen-bridge-helper/' \ - tools/qemu-xen/include/net/net.h \ - tools/qemu-xen/meson.build \ - tools/qemu-xen/qemu-bridge-helper.c \ - tools/qemu-xen/qemu-options.hx - eapply "${XEN_GENTOO_PATCHES_DIR}" fi + # Rename qemu-bridge-helper to xen-bridge-helper to avoid file + # collisions with app-emulation/qemu. + sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \ + tools/qemu-xen/include/net/net.h \ + tools/qemu-xen/Makefile \ + tools/qemu-xen/qemu-bridge-helper.c \ + tools/qemu-xen/qemu-options.hx \ + || die + if use ovmf; then mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die diff --git a/app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild b/app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild index 8e3c152ee863..1aa03defc2a3 100644 --- a/app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild @@ -24,7 +24,7 @@ else IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb" XEN_PRE_PATCHSET_NUM=0 - XEN_GENTOO_PATCHSET_NUM=0 + XEN_GENTOO_PATCHSET_NUM=1 XEN_PRE_VERSION_BASE=4.16.1 XEN_BASE_PV="${PV}" @@ -46,13 +46,13 @@ else if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}" XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}" - SRC_URI+=" https://github.com/Flowdalic/xen-upstream-patches/archive/refs/tags/${XEN_UPSTREAM_PATCHES_TAG}.tar.gz -> ${XEN_UPSTREAM_PATCHES_NAME}.tar.gz" + SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2" XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}" fi if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_BASE_PV})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}" XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}" - SRC_URI+=" https://github.com/Flowdalic/xen-gentoo-patches/archive/refs/tags/${XEN_GENTOO_PATCHES_TAG}.tar.gz -> ${XEN_GENTOO_PATCHES_NAME}.tar.gz" + SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2" XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}" fi fi @@ -241,6 +241,16 @@ src_prepare() { eapply "${XEN_GENTOO_PATCHES_DIR}" fi + # Rename qemu-bridge-helper to xen-bridge-helper to avoid file + # collisions with app-emulation/qemu. + sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \ + tools/qemu-xen/include/net/net.h \ + tools/qemu-xen/meson.build \ + tools/qemu-xen/qemu-bridge-helper.c \ + tools/qemu-xen/qemu-options.hx \ + || die + mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die + if use ovmf; then mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die @@ -272,8 +282,6 @@ src_prepare() { echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die fi - mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - # Fix texi2html build error with new texi2html, qemu.doc.html sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index af198a2b542f..e358e892fd4e 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -3,4 +3,5 @@ DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 7c3e3bb066505f9838cd7c56d85debc64e5ed32c DIST xen-4.15.3.tar.gz 40793144 BLAKE2B 33932d855a0502cfe2768a7c8ae19d7da285d70b4970d96fd703daf0ee24a77ad47a3d1b4bcf5f465aa81aa7eb7f9295bce96302b2149ca208fa662cd966d6af SHA512 c25903cc263891885ec76500488405226c8e025bb461d2bf0d590b9bd2d7ca5c2693de7ecc38b3655bfd6793cc96314826559f14a09cc139de8cfdbeb914cbd3 DIST xen-4.16.1.tar.gz 44964667 BLAKE2B 190d9c330b5dcdd47bae26b6ef42111c9c63b71b8b92e20eae268054c6b40aaabadef78c0c9634cb3c3b1bde32a746cbb1404b5eed2a82ab829ba10632103856 SHA512 eeabba9c263cd2425bca083e32b5ebfc6c716c00553759c144fd4b6f64a89836b260787fa25ba22c1f5c4ea65aaad7c95b8c2c1070d3377b1c43c9517aa7032a DIST xen-gentoo-patches-4.16.1-gentoo-patchset-0.tar.gz 5289 BLAKE2B 4946056ee631ec0fa4d29f1cd643f66b491ef3ea049755d10d7b8e189f02816b990e53bffbeeeae0a61fb4e20aa877f5903a8aadfb26d0c78566a0e9fde540c7 SHA512 59d4101879bd18e828349db3814a9082b85c5ba8203ce98e5082491a9ede9c832a02ac7e4d7a0a51a52e38b72e5cce1eea6a09d6c5202e96bfe2aa4d47e12e65 -DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.gz 46026 BLAKE2B 57bca21962c9a451316f486f5db94e9c1b98b5e029a15dbd702007d573fe02571e648866c9ddbc293e53ceb5de92122b13d21e28c8879d918129134725c9ff91 SHA512 f665640fc686dfc5f718531601f66e3f30c4c8c7cb78293b6a615fe9f53a3763f2c864642a19336bb077d432b776ab1c9fa39e6fa5857ca3360e4d1b1ce63f50 +DIST xen-gentoo-patches-4.16.1-gentoo-patchset-1.tar.bz2 4351 BLAKE2B 1ba306fbc4a55aa1fea71139f7a900c8c363cf948f34a2aabd1ff6f8a68f2e632154ea0e0289580c84328b372c4f8cfdb2879bc63ae3ec163bfb29487783a758 SHA512 8d8198fbf8d9d4b46a83cf46c965448cb47b30438518a70c9b552c7cd1b23616e50f615206ddb18603e8482d19b25ccb611904c404d445898928ecf88051b70d +DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.bz2 40645 BLAKE2B 198beb134604b221bc81fb4d32daec074a7c088c7f9bf99c2a9e98bdab2d8bf7e10c0fea9106d039de255fb209a8ac2955d1e724325a5016e6ecbdd94fbb9584 SHA512 d849418fb215a5bb9ea31ea03de6fbb8b1834d9a8e9face0bd3f20ab7bbd3a17cb13e9b3b653a3a5f06fad609b01dbcaa16f7377ead015a9d97cb8f960d0de49 diff --git a/app-emulation/xen/xen-4.16.2_pre1.ebuild b/app-emulation/xen/xen-4.16.2_pre1.ebuild index 2e8dbf6d958b..933fd041febc 100644 --- a/app-emulation/xen/xen-4.16.2_pre1.ebuild +++ b/app-emulation/xen/xen-4.16.2_pre1.ebuild @@ -15,7 +15,7 @@ else KEYWORDS="~amd64 ~arm -x86" XEN_PRE_PATCHSET_NUM=0 - XEN_GENTOO_PATCHSET_NUM=0 + XEN_GENTOO_PATCHSET_NUM=1 XEN_PRE_VERSION_BASE=4.16.1 XEN_BASE_PV="${PV}" @@ -28,13 +28,13 @@ else if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}" XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}" - SRC_URI+=" https://github.com/Flowdalic/xen-upstream-patches/archive/refs/tags/${XEN_UPSTREAM_PATCHES_TAG}.tar.gz -> ${XEN_UPSTREAM_PATCHES_NAME}.tar.gz" + SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2" XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}" fi if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_BASE_PV})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}" XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}" - SRC_URI+=" https://github.com/Flowdalic/xen-gentoo-patches/archive/refs/tags/${XEN_GENTOO_PATCHES_TAG}.tar.gz -> ${XEN_GENTOO_PATCHES_NAME}.tar.gz" + SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2" XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}" fi fi diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz index a34292326be8..62dfe3040ffd 100644 Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ diff --git a/app-forensics/aflplusplus/aflplusplus-4.01c.ebuild b/app-forensics/aflplusplus/aflplusplus-4.01c-r1.ebuild similarity index 100% rename from app-forensics/aflplusplus/aflplusplus-4.01c.ebuild rename to app-forensics/aflplusplus/aflplusplus-4.01c-r1.ebuild diff --git a/app-forensics/aflplusplus/files/aflplusplus-4.01c-respect-flags.patch b/app-forensics/aflplusplus/files/aflplusplus-4.01c-respect-flags.patch index 1cfc03d5f42b..0fe62c0b41ae 100644 --- a/app-forensics/aflplusplus/files/aflplusplus-4.01c-respect-flags.patch +++ b/app-forensics/aflplusplus/files/aflplusplus-4.01c-respect-flags.patch @@ -1,4 +1,4 @@ -* Respect CC, CFLAGS, CPPFLAGS, LDFLAGS everywhere when building. +* Respect AR, CC, CFLAGS, CPPFLAGS, LDFLAGS everywhere when building. * Ignore build flags then when testing the CC wrappers (could contain incompatible flags). * Disable LTO for runtime objects, these shouldn't contain IR. @@ -50,6 +50,15 @@ ln -sf afl-cc.8 afl-gcc-fast.8 --- a/GNUmakefile.llvm +++ b/GNUmakefile.llvm +@@ -410,7 +410,7 @@ endif + + ./afl-ld-lto: src/afl-ld-lto.c + ifeq "$(LLVM_LTO)" "1" +- $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ + endif + + ./SanitizerCoverageLTO.so: instrumentation/SanitizerCoverageLTO.so.cc instrumentation/afl-llvm-common.o @@ -444,25 +444,25 @@ afl-llvm-dict2file.so: instrumentation/afl-llvm-dict2file.so.cc instrumentation/ .PHONY: document @@ -131,11 +140,12 @@ --- a/utils/aflpp_driver/GNUmakefile +++ b/utils/aflpp_driver/GNUmakefile -@@ -13,40 +13,41 @@ ifneq "" "$(LLVM_BINDIR)" +@@ -13,40 +13,42 @@ ifneq "" "$(LLVM_BINDIR)" LLVM_BINDIR := $(LLVM_BINDIR)/ endif -CFLAGS := -O3 -funroll-loops -g -fPIC ++AR ?= ar +CFLAGS ?= -O3 -funroll-loops -g +CFLAGS += -fPIC -fno-lto @@ -147,7 +157,7 @@ libAFLDriver.a: aflpp_driver.o - @ar rc libAFLDriver.a aflpp_driver.o -+ ar rc libAFLDriver.a aflpp_driver.o ++ $(AR) rc libAFLDriver.a aflpp_driver.o @cp -vf libAFLDriver.a ../../ debug: @@ -157,7 +167,8 @@ + $(CC) $(CPPFLAGS) -I../../include -D_DEBUG=\"1\" $(CFLAGS) -g -funroll-loops -c aflpp_driver.c #$(LLVM_BINDIR)clang -S -emit-llvm -Wno-deprecated -I../../include $(CFLAGS) -D_DEBUG=\"1\" -c -o afl-performance.ll ../../src/afl-performance.c #$(LLVM_BINDIR)clang -S -emit-llvm -I../../include -D_DEBUG=\"1\" -g -funroll-loops -c aflpp_driver.c - ar rc libAFLDriver.a afl-performance.o aflpp_driver.o +- ar rc libAFLDriver.a afl-performance.o aflpp_driver.o ++ $(AR) rc libAFLDriver.a afl-performance.o aflpp_driver.o aflpp_qemu_driver.o: aflpp_qemu_driver.c - -$(LLVM_BINDIR)clang $(CFLAGS) -O0 -funroll-loops -c aflpp_qemu_driver.c @@ -166,7 +177,7 @@ libAFLQemuDriver.a: aflpp_qemu_driver.o - @-ar rc libAFLQemuDriver.a aflpp_qemu_driver.o - @-cp -vf libAFLQemuDriver.a ../../ -+ ar rc libAFLQemuDriver.a aflpp_qemu_driver.o ++ $(AR) rc libAFLQemuDriver.a aflpp_qemu_driver.o + @cp -vf libAFLQemuDriver.a ../../ aflpp_qemu_driver_hook.so: aflpp_qemu_driver_hook.o diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz index 0e00ee625975..e049e6ea7f77 100644 Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest index 49e8d1e5a765..f1be4a9c7d55 100644 --- a/app-i18n/ibus-libpinyin/Manifest +++ b/app-i18n/ibus-libpinyin/Manifest @@ -1,2 +1 @@ -DIST ibus-libpinyin-1.11.92.tar.gz 1730065 BLAKE2B 376bec6fa7616364c8ed4dc5b269edabda892ba4759ff03e93b4099c99440925126800ea3bf11eef91ea62c558fa7dbf05f3d68be5e25e701aaaeb37618b90a8 SHA512 b875b2fed6875806971b91e2abc62cdab1f70baef78840915f89466a7bcf3d1dfc70438ba85e7580bba92dec0ade50a2b05955fe6cd148bffd3888fa69f1c851 DIST ibus-libpinyin-1.12.1.tar.gz 1766803 BLAKE2B 1de8a51b52688dede32c572b39bd379296480ab2b0f909357465370e346bdf50f4cade5ab3f105f62a74e59cf2dc5e8d5235aedde7571b70d3c5dcee86d2e36b SHA512 ad6e7507bdb468d506071135449383e5bd4fc878bcffda4be6e4e7915b79dbaf919d2fa941b92b177dc7790bd895eaa9a6d04a2610f85e1e80e8eb50f188211d diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild deleted file mode 100644 index 313024e17794..000000000000 --- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2015-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -LUA_COMPAT=( lua5-{1..3} ) -PYTHON_COMPAT=( python3_{8..9} ) - -inherit autotools gnome2-utils lua-single python-single-r1 - -DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus" -HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/" -SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="boost lua opencc" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - lua? ( ${LUA_REQUIRED_USE} )" - -BDEPEND="dev-db/sqlite:3 - virtual/pkgconfig" - -DEPEND="${PYTHON_DEPS} - >=app-i18n/libpinyin-2.1.0:= - dev-db/sqlite:3 - dev-libs/glib:2 - virtual/libintl - $(python_gen_cond_dep ' - app-i18n/ibus[python(+),${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') - boost? ( dev-libs/boost:= ) - lua? ( ${LUA_DEPS} ) - opencc? ( app-i18n/opencc:= )" - -RDEPEND="${DEPEND}" - -pkg_setup() { - python-single-r1_pkg_setup - - if use lua; then - lua-single_pkg_setup - fi -} - -src_prepare() { - sed -i \ - -e "/^appdatadir/s:/appdata:/metainfo:" \ - data/Makefile.am || die - default - eautoreconf -} - -src_configure() { - econf \ - --enable-english-input-mode \ - $(use_enable boost) \ - $(use_enable lua lua-extension) \ - $(use_enable opencc) -} - -pkg_postinst() { - gnome2_schemas_update -} - -pkg_postrm() { - gnome2_schemas_update -} diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest index 1dec4c5fa042..0284c6871f83 100644 --- a/app-i18n/opencc/Manifest +++ b/app-i18n/opencc/Manifest @@ -1 +1,2 @@ DIST opencc-1.1.3.tar.gz 2805430 BLAKE2B 060ca820676a92ddfddc362488031e1ada538626a1fbeb8d178a0ef059b99f606cb0f1151857579221942183820bf34c6f96517d13d4ae8dc3f81846537b668d SHA512 90da656fa4790c58932ad2240a076cc4a9e8cf70ac73d83e0d299e84472deb6491a823966a7686ed1487ef8405909981b9a12b661d8de7f086bd4b498594abac +DIST opencc-1.1.4.tar.gz 2806887 BLAKE2B 150fd83818616de42e535f349b2574ff3319e41618e522583a57a00ab08b7f28db6e8f4fa4a0d4dbe027753b5be87065b2015542251986c6301ad441c4bf4c98 SHA512 ab8e7e6a0cc71106cf09eb32899fa8620b946a406f042d75a2444096e0b383cb1993d6c2d12cd7862e71854da4cd5893442bce51df84c32ed09fdfb4a2846f46 diff --git a/app-i18n/opencc/opencc-1.1.4.ebuild b/app-i18n/opencc/opencc-1.1.4.ebuild new file mode 100644 index 000000000000..2aaf1b88291f --- /dev/null +++ b/app-i18n/opencc/opencc-1.1.4.ebuild @@ -0,0 +1,69 @@ +# Copyright 2010-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +PYTHON_COMPAT=( python3_{8..10} ) + +inherit cmake python-any-r1 + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/BYVoid/OpenCC" +fi + +DESCRIPTION="Library for conversion between Traditional and Simplified Chinese characters" +HOMEPAGE="https://github.com/BYVoid/OpenCC" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" +else + SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="Apache-2.0" +SLOT="0/1.1" +KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND="${PYTHON_DEPS} + doc? ( app-doc/doxygen )" +DEPEND="dev-cpp/tclap + dev-libs/darts + dev-libs/marisa:0= + dev-libs/rapidjson + test? ( + dev-cpp/gtest + !hppa? ( !sparc? ( dev-cpp/benchmark ) ) + )" +RDEPEND="dev-libs/marisa:0=" + +if [[ "${PV}" != "9999" ]]; then + S="${WORKDIR}/OpenCC-ver.${PV}" +fi + +DOCS=(AUTHORS NEWS.md README.md) + +src_prepare() { + rm -r deps || die + + cmake_src_prepare + + sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i doc/CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DBUILD_DOCUMENTATION=$(usex doc ON OFF) + -DENABLE_BENCHMARK=$(if use test && has_version -d dev-cpp/benchmark; then echo ON; else echo OFF; fi) + -DENABLE_GTEST=$(usex test ON OFF) + -DUSE_SYSTEM_DARTS=ON + -DUSE_SYSTEM_GOOGLE_BENCHMARK=ON + -DUSE_SYSTEM_GTEST=ON + -DUSE_SYSTEM_MARISA=ON + -DUSE_SYSTEM_RAPIDJSON=ON + -DUSE_SYSTEM_TCLAP=ON + ) + + cmake_src_configure +} diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index 1ec52ac62def..7e86da822530 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest index 351fc3d0b120..6e4ca381c956 100644 --- a/app-misc/tracker/Manifest +++ b/app-misc/tracker/Manifest @@ -1,3 +1,4 @@ DIST tracker-2.3.6.tar.xz 1606716 BLAKE2B ea39df4438e4502bc0229a5cc3b42a2fe6e13a643ac8e4034004b1291da49ff3ad1a177227035a4a02fd8f3723a735d37371c898bb03a6fc10573606a1c29d70 SHA512 1b8ae06b6c64a0cbe7d4c987bafe392fb38014215fc698f919273ba1f422dd0bc24344d3fd73164b00bfea315e527e2886ba90f1f1b86d5fceff24455b36d67e DIST tracker-3.3.0.tar.xz 1969132 BLAKE2B a43183599ee3d3947450e4d58fd02094a41d5978d0c3be120b995844eca5ddc0f7e37bd98e886bec99d5c9342f5ba6f92eec2cd729a1793ce2141bfa5ff99908 SHA512 0a55a80b44c2267f149c4c83ecbe42ca27a0645bd4fc206984999520f6bed3b7c63c71f81450f40ce2896223ce17326add20e7f39a71c821d754f30b8ce157bc DIST tracker-3.3.1.tar.xz 1976268 BLAKE2B 34492aac5c7a5cae20cc3b246de7a7f9948be05356508cffeec56cd6aa83b89a875c01d58c299299723e1aed8bba55d641dc817f77cecbe1379b49ea853aa8b3 SHA512 34a86ac58bf8b31f3beb106d3f8db38b764624b800f4cb1c015102f02616e4c2d356f58f0e6a13f66cca79a4173828748ad5e4217b21e83b2fe1606ddcd7ce88 +DIST tracker-3.3.2.tar.xz 1977512 BLAKE2B 92d8db9ad33b019f47194f086379e1f9370d9ce3643a2a2dc02d277be755e5a892ab4c6bead8c2d50db642aca37141c9961d2fd1f862be57a6e0f78b479eb03f SHA512 2009c7a9b82fd278e38bc71cb41ef1fccb23493bd84a71456c7568ed7a025ce68bab689b8f14b8008479a203a5fdc02acea1862f4f482467ed5c295bde3d4ad8 diff --git a/app-misc/tracker/tracker-3.3.2.ebuild b/app-misc/tracker/tracker-3.3.2.ebuild new file mode 100644 index 000000000000..4c0399012f73 --- /dev/null +++ b/app-misc/tracker/tracker-3.3.2.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..11} ) +VALA_MIN_API_VERSION="0.40" + +inherit bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg + +DESCRIPTION="A tagging metadata database, search tool and indexer" +HOMEPAGE="https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME/tracker" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="3/0" # libtracker-sparql-3.0 soname version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="gtk-doc +miners stemmer test" +RESTRICT="!test? ( test )" + +PV_SERIES=$(ver_cut 1-2) + +RDEPEND=" + >=dev-libs/glib-2.52:2 + >=sys-apps/dbus-1.3.2 + >=dev-libs/gobject-introspection-1.54:= + >=dev-libs/icu-4.8.1.2:= + >=dev-libs/json-glib-1.4 + >=net-libs/libsoup-2.40.1:2.4 + >=dev-libs/libxml2-2.7 + >=dev-db/sqlite-3.29.0 + stemmer? ( dev-libs/snowball-stemmer:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + app-text/asciidoc + dev-libs/libxslt + $(vala_depend) + gtk-doc? ( + >=dev-util/gtk-doc-1.8 + app-text/docbook-xml-dtd:4.1.2 + app-text/docbook-xml-dtd:4.5 + ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + test? ( + $(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]') + $(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]') + ) + ${PYTHON_DEPS} +" +PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )" + +function inotify_enabled() { + if linux_config_exists; then + if ! linux_chkconfig_present INOTIFY_USER; then + ewarn "You should enable the INOTIFY support in your kernel." + ewarn "Check the 'Inotify support for userland' under the 'File systems'" + ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config" + die 'missing CONFIG_INOTIFY' + fi + else + einfo "Could not check for INOTIFY support in your kernel." + fi +} + +python_check_deps() { + python_has_version -b \ + "dev-python/pygobject[${PYTHON_USEDEP}]" \ + "dev-python/tappy[${PYTHON_USEDEP}]" +} + +pkg_setup() { + linux-info_pkg_setup + inotify_enabled + + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + vala_setup + xdg_environment_reset +} + +src_configure() { + append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS + + local emesonargs=( + $(meson_use gtk-doc docs) + -Dman=true + $(meson_feature stemmer) + -Dunicode_support=icu + -Dbash_completion_dir="$(get_bashcompdir)" + -Dsystemd_user_services_dir="$(systemd_get_userunitdir)" + $(meson_use test tests) + -Dintrospection=enabled + -Dsoup=soup2 + ) + meson_src_configure +} + +src_test() { + dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest index e8fb6586b1d4..633ae691ad4b 100644 --- a/app-misc/yq/Manifest +++ b/app-misc/yq/Manifest @@ -1,2 +1,3 @@ DIST yq-2.13.0.tar.gz 21695 BLAKE2B e6d75cde2c298c19616647aeb14f1e34b1a68bb4db1b7e6f4e2619166ef10142ebd405d3c21492e4f5880c46a8d42222ce22b08afec492e97102923e6b838e2d SHA512 fd2722450606175b7d6674407c992f1f542b8b2309fcb33d4eb7d6e3dbc6dbc9e04b3dae7c4c649d814fdffaa18cbd50472672f1d1357fc58c5306de082b353a DIST yq-2.14.0.tar.gz 28030 BLAKE2B 07e200524390e938705854c5d1ac4921fbc8f165cdbf8152e36124e52a1c51c70d6d711b67a3dac8c2bbf1f75040466e8d94505aa5f19e388a31bbcdc92e91bd SHA512 77d5d9cefc70fae9f2606434e11c3b14facb68113f6f99017f87acc860684a1b7a94ecf01514e8fa85a6d9cc860df926e13d1ac5bec160e7d057074d758d1d34 +DIST yq-3.0.2.tar.gz 28939 BLAKE2B 146fe302064db21ae3d93224875bb49a49a3392e4be3acb9265c6bac98b754f5e75910e03b9ce0c3f5eaa19dbf959144d9443f24ecb5ecec9382cd85d7d03e8f SHA512 228b8390c6429381cefed32327e502d0f975cd4c3bf7918efad7e8119b5a93b4ff1216fd35117eed46b8282ec6a7314ae1a15028deab45aa3fc2cb5b6d86a777 diff --git a/app-misc/yq/yq-3.0.2.ebuild b/app-misc/yq/yq-3.0.2.ebuild new file mode 100644 index 000000000000..1a8f2da5f32d --- /dev/null +++ b/app-misc/yq/yq-3.0.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents" +HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + app-misc/jq + dev-python/argcomplete[${PYTHON_USEDEP}] + >=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}] + dev-python/toml[${PYTHON_USEDEP}] + dev-python/xmltodict[${PYTHON_USEDEP}] +" +DEPEND=" + ${RDEPEND} + test? ( + dev-python/wheel[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/yq-2.13.0-tests.patch" +) + +python_prepare_all() { + sed -e 's:unittest.main():unittest.main(verbosity=2):' \ + -i test/test.py || die + + sed -r -e 's:[[:space:]]*"coverage",:: ; s:[[:space:]]*"flake8",::' \ + -i setup.py || die + + sed -e '/license_file/ d' -i setup.cfg || die + + distutils-r1_python_prepare_all +} + +python_test() { + "${EPYTHON}" test/test.py | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \ - -i nls/Makefile.in || die - - # always use sysmalloc, the builtin malloc fails on Darwin, musl, - # etc. it's already used for glibc-linux, so this doesn't change - # anything for the majority of users - sed -i -e 's/undef SYSMALLOC/define SYSMALLOC/' config_f.h || die - - # unify ECHO behaviour - echo "#undef ECHO_STYLE" >> config_f.h - echo "#define ECHO_STYLE BOTH_ECHO" >> config_f.h - - eprefixify "${CONFDIR}"/* - # activate the right default PATH - if [[ -z ${EPREFIX} ]] ; then - sed -i \ - -e 's/^#MAIN//' -e '/^#PREFIX/d' \ - "${CONFDIR}"/csh.login || die - else - sed -i \ - -e 's/^#PREFIX//' -e '/^#MAIN/d' \ - "${CONFDIR}"/csh.login || die - fi - - eapply_user -} - -src_configure() { - # make tcsh look and live along the lines of the prefix - append-cppflags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'" - append-cppflags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'" - append-cppflags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'" - append-cppflags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'" - append-cppflags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'" - - # musl's utmp is non-functional - if use elibc_musl ; then - export ac_cv_header_utmp_h=no - export ac_cv_header_utmpx_h=no - fi - - econf \ - --prefix="${EPREFIX:-}" \ - --datarootdir='${prefix}/usr/share' \ - $(use_enable nls) -} - -src_install() { - emake DESTDIR="${D}" install install.man - - DOCS=( FAQ Fixes NewThings Ported README.md WishList Y2K ) - if use doc ; then - perl tcsh.man2html tcsh.man || die - HTML_DOCS=( tcsh.html/*.html ) - fi - einstalldocs - - insinto /etc - doins \ - "${CONFDIR}"/csh.cshrc \ - "${CONFDIR}"/csh.login - - # bug #119703: add csh -> tcsh symlink - dosym tcsh /bin/csh -} diff --git a/app-shells/tcsh/tcsh-6.23.02.ebuild b/app-shells/tcsh/tcsh-6.24.01.ebuild similarity index 91% rename from app-shells/tcsh/tcsh-6.23.02.ebuild rename to app-shells/tcsh/tcsh-6.24.01.ebuild index 4dde5bb6b458..5e5a97fcea75 100644 --- a/app-shells/tcsh/tcsh-6.23.02.ebuild +++ b/app-shells/tcsh/tcsh-6.24.01.ebuild @@ -10,12 +10,13 @@ CONFVER="1.9" DESCRIPTION="Enhanced version of the Berkeley C shell (csh)" HOMEPAGE="https://www.tcsh.org/" SRC_URI=" + ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz ftp://ftp.astron.com/pub/tcsh/old/${P}.tar.gz https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="nls doc" RESTRICT="test" diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz index f20b35ddffd4..8dfc26da697a 100644 Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ diff --git a/dev-cpp/folly/folly-2022.03.28.00.ebuild b/dev-cpp/folly/folly-2022.03.28.00-r1.ebuild similarity index 98% rename from dev-cpp/folly/folly-2022.03.28.00.ebuild rename to dev-cpp/folly/folly-2022.03.28.00-r1.ebuild index f832bf20f635..8bffe87201bd 100644 --- a/dev-cpp/folly/folly-2022.03.28.00.ebuild +++ b/dev-cpp/folly/folly-2022.03.28.00-r1.ebuild @@ -21,7 +21,7 @@ RDEPEND="app-arch/bzip2 app-arch/xz-utils app-arch/zstd:= dev-cpp/gflags:= - dev-cpp/glog[gflags] + dev-cpp/glog:=[gflags] dev-libs/boost:=[context,threads(+)] dev-libs/double-conversion:= dev-libs/libaio diff --git a/dev-cpp/folly/folly-2022.04.11.00.ebuild b/dev-cpp/folly/folly-2022.04.11.00-r1.ebuild similarity index 98% rename from dev-cpp/folly/folly-2022.04.11.00.ebuild rename to dev-cpp/folly/folly-2022.04.11.00-r1.ebuild index ef4a97e38b63..3984f479ebea 100644 --- a/dev-cpp/folly/folly-2022.04.11.00.ebuild +++ b/dev-cpp/folly/folly-2022.04.11.00-r1.ebuild @@ -21,7 +21,7 @@ RDEPEND="app-arch/bzip2 app-arch/xz-utils app-arch/zstd:= dev-cpp/gflags:= - dev-cpp/glog[gflags] + dev-cpp/glog:=[gflags] dev-libs/boost:=[context,threads(+)] dev-libs/double-conversion:= dev-libs/libaio diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest index b52819ecab8c..30b5047877a8 100644 --- a/dev-cpp/glog/Manifest +++ b/dev-cpp/glog/Manifest @@ -1,2 +1,3 @@ DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176 DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b12bf9dd5d31c6e728292ea50f39b4e1b96d55fbb35653a448af4dc8a978e266a2b0f34261c5108099e90845 SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a +DIST glog-0.6.0.tar.gz 193267 BLAKE2B b42112cdfd54280ce7a9592c3af6b6e10dcb854fe9dbe0db7445c60801d1c12a240c4b3709b45e41aedeb8876d2e08fc3368296e088be6a66126858888cc274e SHA512 fd2c42583d0dd72c790a8cf888f328a64447c5fb9d99b2e2a3833d70c102cb0eb9ae874632c2732424cc86216c8a076a3e24b23a793eaddb5da8a1dc52ba9226 diff --git a/dev-cpp/glog/glog-0.6.0.ebuild b/dev-cpp/glog/glog-0.6.0.ebuild new file mode 100644 index 000000000000..3d09a50835b2 --- /dev/null +++ b/dev-cpp/glog/glog-0.6.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 2011-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit cmake-multilib + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/google/glog" +fi + +DESCRIPTION="Google Logging library" +HOMEPAGE="https://github.com/google/glog" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" +else + SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="BSD" +SLOT="0/1" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="gflags +libunwind llvm-libunwind test" +RESTRICT="!test? ( test )" + +RDEPEND="gflags? ( dev-cpp/gflags:0=[${MULTILIB_USEDEP}] ) + libunwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind:0=[${MULTILIB_USEDEP}] ) + !llvm-libunwind? ( sys-libs/libunwind:0=[${MULTILIB_USEDEP}] ) + )" +DEPEND="${RDEPEND} + test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )" + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test ON OFF) + -DWITH_GFLAGS=$(usex gflags ON OFF) + -DWITH_GTEST=$(usex test ON OFF) + -DWITH_UNWIND=$(usex libunwind ON OFF) + ) + + cmake-multilib_src_configure +} + +src_test() { + cmake-multilib_src_test -j1 +} diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz index 6298c47e51e6..f7f5e76522fe 100644 Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild index 92b7d18e73fb..7bf924633a93 100644 --- a/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild +++ b/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild @@ -34,6 +34,7 @@ src_prepare() { src_configure() { tc-export AR BUILD_CC CC PKG_CONFIG + tc-export_build_env } src_compile() { @@ -45,8 +46,8 @@ src_compile() { AR="${AR}" CC="${CC}" HOSTCC="${BUILD_CC}" - HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' - HOSTLDFLAGS="${LDFLAGS}" + HOSTCFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}"' $(HOSTCPPFLAGS)' + HOSTLDFLAGS="${BUILD_LDFLAGS}" ) emake "${myemakeargs[@]}" tools-only_defconfig diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 405eca8841ab..600f1eeacb85 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/bcmail/bcmail-1.71.ebuild b/dev-java/bcmail/bcmail-1.71.ebuild index 4289507b141d..20f703b908f4 100644 --- a/dev-java/bcmail/bcmail-1.71.ebuild +++ b/dev-java/bcmail/bcmail-1.71.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java- LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ~ppc64 x86" CDEPEND=" ~dev-java/bcpkix-${PV}:0 diff --git a/dev-java/bcpg/bcpg-1.71.ebuild b/dev-java/bcpg/bcpg-1.71.ebuild index 909aeecf382f..e6901863e5a5 100644 --- a/dev-java/bcpg/bcpg-1.71.ebuild +++ b/dev-java/bcpg/bcpg-1.71.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java- LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ~ppc64 x86" CDEPEND="~dev-java/bcprov-${PV}:0" DEPEND="${CDEPEND} diff --git a/dev-java/bcpkix/bcpkix-1.71-r1.ebuild b/dev-java/bcpkix/bcpkix-1.71-r1.ebuild index fbfca26ea0c3..412e25dc53d8 100644 --- a/dev-java/bcpkix/bcpkix-1.71-r1.ebuild +++ b/dev-java/bcpkix/bcpkix-1.71-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java- LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ~ppc64 x86" # 1) testSANMismatchIP(org.bouncycastle.est.test.TestHostNameAuthorizer) # org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0 diff --git a/dev-java/bcprov/bcprov-1.71-r1.ebuild b/dev-java/bcprov/bcprov-1.71-r1.ebuild index c0262867fb22..09fcf354c7f3 100644 --- a/dev-java/bcprov/bcprov-1.71-r1.ebuild +++ b/dev-java/bcprov/bcprov-1.71-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java- LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/bcutil/bcutil-1.71.ebuild b/dev-java/bcutil/bcutil-1.71.ebuild index 7413c28335ae..9f0b469f14be 100644 --- a/dev-java/bcutil/bcutil-1.71.ebuild +++ b/dev-java/bcutil/bcutil-1.71.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java- LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ~ppc64 x86" CDEPEND="~dev-java/bcprov-${PV}:0" DEPEND="${CDEPEND} diff --git a/dev-java/byte-buddy-agent/Manifest b/dev-java/byte-buddy-agent/Manifest index b9c0c64af5dd..c34703014fee 100644 --- a/dev-java/byte-buddy-agent/Manifest +++ b/dev-java/byte-buddy-agent/Manifest @@ -1,4 +1,2 @@ DIST byte-buddy-1.12.10.tar.gz 149932619 BLAKE2B dce562c72fce2b4c6f7d7b49192297929c6828b5157db81825199eb6636a6aadfa27240cf69e6ebfef7e809b35aec0037461ec4b30c7633cb700f55458238058 SHA512 5f8c9e94e3661978e51134a65842e376b96acfe25e940c565a2647bec54bb7c40b12501b590019270ce470efc4ca8f4dd0a7ffe7c6d5d2854b768c28c84920a6 -DIST byte-buddy-1.12.8.tar.gz 149928045 BLAKE2B f1fceaea236a7d625739547556cd3775629250ab0cf6ead0643002895d432f06b84bdf193de3d4aa88de8cfdd3ff38a4aa1340076be918c0e5e0c217072cb8e0 SHA512 dffe3f557d29b9c0ac16e8314e2a1fc2b089bda000d5c1307ad2d8808f149f3bef90daa0f8dcc9815d255fc11824b28708b6fddfe942ea8f24ca61f9ea73a1d9 DIST byte-buddy-agent-1.12.10-sources.jar 204651 BLAKE2B f3e0db8e6c8f3380ee3bfd8969555c331689990b97e91206567c01ffbaabc58eeb25b0879e792ebce1044afa8d3b5596830349d9c233ab1af84d13213e046f4d SHA512 8569531e5f5343378037cd9740bdc42b91becb9adaf0f2cacbdcb0e5ccafb3e47fce9c7b71d8d8d8df1c7373ffd44d798b8b164136d87913faed1e19474f803d -DIST byte-buddy-agent-1.12.8-sources.jar 204430 BLAKE2B fe62b36fccc1000b63cf4fdc9a0eda0b767baedbb795ed55d28068ca9bd01f10b47e28edb2ee2d0fccd28e82f531f882091386b9c58f2ca929e17e89f996876a SHA512 576cad5aec60bb1623faf6f2460e9550aab392124579a0ed467128c3cdbc20fb0c4e51dfaa8d56c8f2f314bcc494068aae5c199a0551cbfce053633a2ffb5bd2 diff --git a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild b/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild index e85bf3a8fd17..dd14f79475bf 100644 --- a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild +++ b/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://repo1.maven.org/maven2/net/bytebuddy/${PN}/${PV}/${P}-sources.j LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Compile dependencies # POM: ${P}.pom diff --git a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild b/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild deleted file mode 100644 index 43c4d6ef258c..000000000000 --- a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom byte-buddy-agent-1.12.8.pom --download-uri https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.8/byte-buddy-agent-1.12.8-sources.jar --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-agent-1.12.8.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.8" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM" -HOMEPAGE="https://bytebuddy.net/" -SRC_URI="https://repo1.maven.org/maven2/net/bytebuddy/${PN}/${PV}/${P}-sources.jar - test? ( https://codeload.github.com/raphw/byte-buddy/tar.gz/byte-buddy-1.12.8 -> byte-buddy-${PV}.tar.gz )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Compile dependencies -# POM: ${P}.pom -# com.google.code.findbugs:findbugs-annotations:3.0.1 -> >=dev-java/findbugs-annotations-3.0.1:0 -# com.google.code.findbugs:jsr305:3.0.2 -> >=dev-java/jsr305-3.0.2:0 -# net.java.dev.jna:jna:5.8.0 -> >=dev-java/jna-5.10.0:4 -# net.java.dev.jna:jna-platform:5.8.0 -> !!!artifactId-not-found!!! - -DEPEND=" - >=virtual/jdk-1.8:* - dev-java/findbugs-annotations:0 - dev-java/jna:4 - test? ( dev-java/mockito:4 ) -" - -RDEPEND=" - >=virtual/jre-1.8:* -" - -BDEPEND="app-arch/unzip" - -S="${WORKDIR}" - -JAVA_CLASSPATH_EXTRA="findbugs-annotations,jna-4" -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4" -JAVA_TEST_SRC_DIR="src/test/java" - -# 1) testSystemProperties(net.bytebuddy.agent.VirtualMachineAttachmentTest) -# java.lang.reflect.InvocationTargetException -# -- -# Caused by: java.lang.UnsatisfiedLinkError: Native library (com/sun/jna/linux-x86-64/libjnidispatch.so) not found in resource path (target/test-classes:byte-buddy-agent.jar:/usr/share/findbugs-annotations/lib/findbugs-annotations.jar:/usr/share/jna-4/lib/jna.jar:/usr/share/jna-4/lib/jna-platform.jar:/usr/share/jsr305/lib/jsr305.jar:/usr/share/junit-4/lib/junit.jar:/usr/share/mockito-4/lib/mockito.jar:/usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar:/usr/share/byte-buddy/lib/byte-buddy.jar:/usr/share/byte-buddy-agent/lib/byte-buddy-agent.jar:/usr/share/objenesis/lib/objenesis.jar:/usr/share/opentest4j/lib/opentest4j.jar:/usr/share/junit-4/lib/junit.jar:/usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar) -# at com.sun.jna.Native.loadNativeDispatchLibraryFromClasspath(Native.java:1059) -# -- -# 2) testAgentProperties(net.bytebuddy.agent.VirtualMachineAttachmentTest) -# java.lang.reflect.InvocationTargetException -# -- -# Caused by: java.lang.NoClassDefFoundError: Could not initialize class com.sun.jna.Native -# at net.bytebuddy.agent.VirtualMachine$ForHotSpot$Connection$ForJnaPosixSocket$Factory.(VirtualMachine.java:879) -# -- -# 3) testMultipleProperties(net.bytebuddy.agent.VirtualMachineAttachmentTest) -# java.lang.reflect.InvocationTargetException -# -- -# Caused by: java.lang.NoClassDefFoundError: Could not initialize class com.sun.jna.Native -# at net.bytebuddy.agent.VirtualMachine$ForHotSpot$Connection$ForJnaPosixSocket$Factory.(VirtualMachine.java:879) -# -- -# 4) testAttachment(net.bytebuddy.agent.VirtualMachineAttachmentTest) -# java.lang.reflect.InvocationTargetException -# -- -# Caused by: java.lang.NoClassDefFoundError: Could not initialize class com.sun.jna.Native -# at net.bytebuddy.agent.VirtualMachine$ForHotSpot$Connection$ForJnaPosixSocket$Factory.(VirtualMachine.java:879) -# -- -# FAILURES!!! -# Tests run: 51, Failures: 4 -JAVA_TEST_EXCLUDES="net.bytebuddy.agent.VirtualMachineAttachmentTest" - -src_prepare() { - default - mkdir -p "src/main/java" || die - mv "net" "src/main/java" || die - if use test; then - mv "byte-buddy-byte-buddy-${PV}/byte-buddy-agent/src/test" "src" || die - fi -} diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest index 820f428fa343..62dd7486fe05 100644 --- a/dev-java/byte-buddy/Manifest +++ b/dev-java/byte-buddy/Manifest @@ -1,2 +1 @@ DIST byte-buddy-1.12.10-sources.jar 1331398 BLAKE2B 8732ac81514de40d3d2ffd67ddca05ab9b8a5d0a7f240ee4591fd02b41f410f9e834f389aa898829fbae6082e14a090f87052f537b2b6293c7f8f98d4a5d0583 SHA512 15cb4330598d9259afa29aac0317f8e0e003eb76fb26052bba0714ad30453db721938be7d46fcc6a0c7bbe124bffe68dfee6fcf11a3e4030e99ef01d0ae3d461 -DIST byte-buddy-1.12.8-sources.jar 1327088 BLAKE2B b20101a8e2f68c795ef102b8f2d581c1ebf223dee2170b675f0959bfe547c2793bf79c7e9508b405e43f3561f48423b980ed2e87c6297999a7d1257df4d6524e SHA512 a99d69be07049f4ed162566111c6524a9dd90af459d994a5e917596b5787b74aa88d67a8db7651008558ad687dccbefd0ee87207c6b28ab0660e02abdb43f9c6 diff --git a/dev-java/byte-buddy/byte-buddy-1.12.10.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.10.ebuild index ec91f1a60298..482eea806388 100644 --- a/dev-java/byte-buddy/byte-buddy-1.12.10.ebuild +++ b/dev-java/byte-buddy/byte-buddy-1.12.10.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/net/bytebuddy/${PN}/${PV}/${P}-sources.j LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Compile dependencies # POM: ${P}.pom diff --git a/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild deleted file mode 100644 index a25c51f399f4..000000000000 --- a/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom byte-buddy-1.12.8.pom --download-uri https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.12.8/byte-buddy-1.12.8-sources.jar --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.8.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="net.bytebuddy:byte-buddy:1.12.8" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Byte Buddy is a Java library for creating Java classes at run time" -HOMEPAGE="https://bytebuddy.net/" -SRC_URI="https://repo1.maven.org/maven2/net/bytebuddy/${PN}/${PV}/${P}-sources.jar" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Compile dependencies -# POM: ${P}.pom -# com.google.code.findbugs:findbugs-annotations:3.0.1 -> >=dev-java/findbugs-annotations-3.0.1:0 -# com.google.code.findbugs:jsr305:3.0.2 -> >=dev-java/jsr305-3.0.2:0 -# net.java.dev.jna:jna:5.8.0 -> >=dev-java/jna-5.10.0:4 -# net.java.dev.jna:jna-platform:5.8.0 -> !!!artifactId-not-found!!! - -DEPEND=" - >=virtual/jdk-1.8:* - dev-java/findbugs-annotations:0 - >=dev-java/jna-5.10.0:4 -" - -RDEPEND=" - >=virtual/jre-1.8:* -" - -BDEPEND="app-arch/unzip" - -S="${WORKDIR}" - -JAVA_CLASSPATH_EXTRA="findbugs-annotations,jna-4" - -src_prepare() { - default - java-pkg_clean -} diff --git a/dev-java/javax-jms-api/Manifest b/dev-java/javax-jms-api/Manifest new file mode 100644 index 000000000000..b3fa25d684ad --- /dev/null +++ b/dev-java/javax-jms-api/Manifest @@ -0,0 +1 @@ +DIST javax-jms-api-2.0.3-RELEASE.tar.gz 162689 BLAKE2B cd59e263f649d30dcd4a117c95943c2fca4141822dc23f425286d142849c2be99a0e866f4f3439917a2a09c722a74b067025e34053f1afa7ee8654cca253d54c SHA512 64f492c17eb84a61e23da53755ce074c5c957204651a391f7e879992f8b781d6b8afbfc7f13898f1e5f5dcb384b3ae31807b4acde111f587703d5d8bc08b5063 diff --git a/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild b/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild new file mode 100644 index 000000000000..95b4a86c8724 --- /dev/null +++ b/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom api/pom.xml --download-uri https://github.com/jakartaee/messaging/archive/2.0.3-RELEASE.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javax-jms-api-2.0.3.ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="jakarta.jms:jakarta.jms-api:2.0.3" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Jakarta Messaging" +HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jms" +SRC_URI="https://github.com/jakartaee/messaging/archive/${PV}-RELEASE.tar.gz -> ${P}-RELEASE.tar.gz" + +LICENSE="EPL-2.0 GPL-2-with-classpath-exception" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( NOTICE.md README.md ) + +S="${WORKDIR}/messaging-${PV}-RELEASE" + +JAVA_SRC_DIR="api/src/main/java" diff --git a/dev-java/javax-jms-api/metadata.xml b/dev-java/javax-jms-api/metadata.xml new file mode 100644 index 000000000000..ca6cf7f390be --- /dev/null +++ b/dev-java/javax-jms-api/metadata.xml @@ -0,0 +1,10 @@ + + + + + java@gentoo.org + + + Jakarta Messaging describes a means for Java applications to create, send, and receive messages via loosely coupled, reliable asynchronous communication services. + + diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest index 75ab7c5f1a9a..62491b0a4cad 100644 --- a/dev-java/jctools-core/Manifest +++ b/dev-java/jctools-core/Manifest @@ -1,2 +1,3 @@ DIST jctools-3.1.0.tar.gz 4204148 BLAKE2B 88f8f5395470072571de64ee3d696e90c1fbf22a6e9c1424463bfb8b497dd3d47f8d0fcc9a039acec8380ac52a3d445789257d5a1071e49e6963c59d156065e2 SHA512 bf69387732dea043e6e5fa44fe60a5f80ef5ae9d32ebb39ac16353e5bd82502b3b6e5564a8bd9f3b8ad073a95ff984ae55133884ebeea9d0b9a777c488af2a74 +DIST jctools-3.3.0.tar.gz 4214717 BLAKE2B c9c5f5897ebf8bb7ac439b969f372c45b7652517cbc5369c07fe80d11f779eebe7fe5ffb5d93a18fe3df5d9ca9adf3cee7268c8c6ed962fccb4d84f5b0451c4b SHA512 ce212abacca6137a133f7a4e94370442d00bf73794fa7b9ce440631701a9a2fca31c4dda05e2a768fcf28f75e84f2a7f318a936e429c7f4ed20daa7b79d11a4a DIST jctools-core-2.0.2.tar.gz 4136573 BLAKE2B 6ca4c276422b24b18256b35606b6e59e8be53b77fe0b757e4f46dc4e0bdab0ea8fbb8c58e84794c689aa1df29a80aa847b6baf7cda430f2657720ecb5d60e99f SHA512 734905d6847664a08557fa9807766bfe2cd57e9562f1dc0d908c9fffc627c1cb7576ac079715004da9a1f2ee958c8373caf60c110ef3de8f7da5bb04775f6f7f diff --git a/dev-java/jctools-core/jctools-core-3.3.0.ebuild b/dev-java/jctools-core/jctools-core-3.3.0.ebuild new file mode 100644 index 000000000000..4fe5ac01487c --- /dev/null +++ b/dev-java/jctools-core/jctools-core-3.3.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/JCTools/JCTools/archive/v3.3.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jctools-core-3.3.0.ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.jctools:jctools-core:3.3.0" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java Concurrency Tools Core Library" +HOMEPAGE="https://jctools.github.io/JCTools/" +SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="3" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=">=virtual/jdk-1.8:* + test? ( + dev-java/guava-testlib:0 + dev-java/hamcrest-library:1.3 + )" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( ../{README,RELEASE-NOTES}.md ) + +S="${WORKDIR}/JCTools-${PV}/jctools-core" + +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest-library-1.3,junit-4" +JAVA_TEST_SRC_DIR="src/test/java" + +# Using the defaults of java-pkg-simple would skip more than half the number of tests. +src_test() { + # org.jetbrains.kotlinx.lincheck is not yet packaged + rm -r src/test/java/org/jctools/maps/linearizability_test || die + # These tests would fail and are not run by "mvn test". + # "org.jctools.queues.MpqSanityTest" + # "org.jctools.queues.QueueSanityTest" + # "org.jctools.queues.ScQueueRemoveTest" + # "org.jctools.util.TestUtil" + pushd src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + \( -name "*Test*.java" \ + -o -name "nbsi_tester.java" \ + -o -name "nbhs_tester.java" \)\ + ! -name "MpqSanityTest.java" \ + ! -name "QueueSanityTest.java" \ + ! -name "ScQueueRemoveTest.java" \ + ! -name "TestUtil.java" \ + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test + # OK (7226 tests) +} diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest index 1d8ab37fde64..8790b86f56df 100644 --- a/dev-java/jna/Manifest +++ b/dev-java/jna/Manifest @@ -1,2 +1 @@ -DIST jna-5.10.0.tar.gz 106258319 BLAKE2B f5605fd91bacc1e900e835494c27b0fdb4ba91b0c04bad1757133bed5938603264ce9fba89c5ce7e4644456b752b934f6e205d0131659e77bf0c58c2b44c61cd SHA512 93e1ab659a60d711557eb93620bcbd05f3dbe9c739b256cfb647d8ac2a4038d0bc638c614b58339b2875017ac18b219a4ddeb0d92e5ca25fef2e326bc14ae256 DIST jna-5.11.0.tar.gz 107424072 BLAKE2B 9f79a0b0e643c8213c159785814dffaeee2dc3b332647c5c887aa5a6e707be5241d392e75730b803b21362fcbdcee82d7049bcdfb7956039f1534e3cd8e170cf SHA512 0122b56c24125e5dea541bee71b43f127df50c8f90b2c240271c677a8d598d9640bb920bd3390856124e8b1bc89a9bd41d2b6c569ae7275f68a13c08fd07027d diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild deleted file mode 100644 index 4e08475cbb53..000000000000 --- a/dev-java/jna/jna-5.10.0.ebuild +++ /dev/null @@ -1,99 +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 test" -MAVEN_ID="net.java.dev.jna:jna:5.10.0" - -inherit java-pkg-2 java-ant-2 toolchain-funcs - -DESCRIPTION="Java Native Access" -HOMEPAGE="https://github.com/java-native-access/jna" -SRC_URI="https://github.com/java-native-access/jna/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="|| ( Apache-2.0 LGPL-2.1+ )" -SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -BDEPEND=" - virtual/pkgconfig -" - -CDEPEND=" - >=dev-libs/libffi-3.4:= -" - -DEPEND=" - >=virtual/jdk-1.8:* - dev-java/animal-sniffer-annotations:0 - dev-java/ant-core:0 - dev-java/asm:9 - test? ( - dev-java/ant-junit4:0 - dev-java/junit:4 - dev-java/reflections:0 - ) - ${CDEPEND} - x11-libs/libXt -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND} -" - -DOCS=( README.md CHANGES.md OTHERS TODO ) -PATCHES=( - "${FILESDIR}/${PV}-build.xml.patch" - "${FILESDIR}/4.2.2-makefile-flags.patch" -) - -JAVA_ANT_REWRITE_CLASSPATH="true" -JAVA_PKG_BSFIX_NAME="build.xml build-ant-tools.xml" -EANT_BUILD_TARGET="jar contrib-jars" -EANT_EXTRA_ARGS="-Dbuild-native=true -Dcompatibility=1.8 -Ddynlink.native=true" -EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=\"${T}\"" -EANT_TEST_GENTOO_CLASSPATH="animal-sniffer-annotations,reflections" - -pkg_setup() { - java-pkg-2_pkg_setup - - EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only \ - animal-sniffer-annotations,ant-core,asm-9)" - - # Any spaces in paths returned by toolchain-funcs and options like MAKEOPTS - # could cause trouble in EANT_EXTRA_ARGS when Java eclasses process the - # variable's value, so define them in ANT_OPTS instead - ANT_OPTS="-DCC='$(tc-getCC)'" - # Parallel build does not respect dependency relationships between objects - ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'" -} - -src_prepare() { - default - - # Eliminate build.xml's dependency on bundled native JARs - sed -i -e '/zipfileset src="${lib.native}/,+2d' build.xml || - die "Failed to delete lines referencing bundled JARs in build.xml" - - # Clean up bundled JARs and libffi - java-pkg_clean - rm -r native/libffi || die "Failed to remove bundled libffi" - - java-pkg-2_src_prepare -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar "build/${PN}-min.jar" - java-pkg_dojar "contrib/platform/dist/${PN}-platform.jar" - java-pkg_doso build/native-*/libjnidispatch.so - einstalldocs - - use source && java-pkg_dosrc src/* - use doc && java-pkg_dojavadoc doc/javadoc -} diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0.ebuild index 9e6092e7e10a..0d53024ae379 100644 --- a/dev-java/jna/jna-5.11.0.ebuild +++ b/dev-java/jna/jna-5.11.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/java-native-access/jna/archive/refs/tags/${PV}.tar.g LICENSE="|| ( Apache-2.0 LGPL-2.1+ )" SLOT="4" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" BDEPEND=" virtual/pkgconfig diff --git a/dev-java/log4j-12-api/Manifest b/dev-java/log4j-12-api/Manifest index 0116f1a3571a..71eb0f57dfac 100644 --- a/dev-java/log4j-12-api/Manifest +++ b/dev-java/log4j-12-api/Manifest @@ -1 +1,2 @@ DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176 +DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b diff --git a/dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild new file mode 100644 index 000000000000..cb01db0c5062 --- /dev/null +++ b/dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom log4j-1.2-api/pom.xml --download-uri mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-12-api-2.18.0.ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.logging.log4j:log4j-1.2-api:2.18.0" +JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="The Apache Log4j 1.x Compatibility API" +HOMEPAGE="https://logging.apache.org/log4j/2.x/" +SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +# We don't have junit-vintage and junit-jupiter +RESTRICT="test" + +# Common dependencies +# POM: log4j-1.2-api/pom.xml +# org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2 +# org.apache.logging.log4j:log4j-core:2.18.0 -> >=dev-java/log4j-core-2.18.0:2 + +CP_DEPEND=" + ~dev-java/log4j-api-${PV}:2 + ~dev-java/log4j-core-${PV}:2 +" + +# Compile dependencies +# POM: log4j-1.2-api/pom.xml +# javax.jms:javax.jms-api:2.0.1 -> !!!groupId-not-found!!! +# POM: log4j-1.2-api/pom.xml +# test? com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3 -> >=dev-java/jackson-dataformat-xml-2.13.3:0 +# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1 +# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6 +# test? org.apache.felix:org.apache.felix.framework:7.0.5 -> !!!groupId-not-found!!! +# test? org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2 +# test? org.apache.logging.log4j:log4j-core:2.18.0 -> >=dev-java/log4j-core-2.18.0:2 +# test? org.apache.velocity:velocity:1.7 -> !!!artifactId-not-found!!! +# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!! +# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!! +# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!! +# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!! +# test? org.mockito:mockito-core:4.4.0 -> >=dev-java/mockito-4.4.0:4 +# test? oro:oro:2.0.8 -> >=dev-java/jakarta-oro-2.0.8:2.0 + +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* + dev-java/javax-jms-api:0 +" +# test? ( +# !!!artifactId-not-found!!! +# !!!groupId-not-found!!! +# >=dev-java/commons-io-2.11.0:1 +# >=dev-java/jackson-dataformat-xml-2.13.0:0 +# ~dev-java/log4j-api-${PV}:2 +# ~dev-java/log4j-core-${PV}:2 +# ) +#" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:* +" + +DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md ) + +S="${WORKDIR}/apache-log4j-${PV}-src" + +JAVA_CLASSPATH_EXTRA="javax-jms-api" +JAVA_SRC_DIR="log4j-1.2-api/src/main/java" +JAVA_RESOURCE_DIRS="log4j-1.2-api/src/main/resources" + +#JAVA_TEST_GENTOO_CLASSPATH="jackson-dataformat-xml,commons-io-1,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,log4j-core-2,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,mockito-4,jakarta-oro-2.0" +#JAVA_TEST_SRC_DIR="log4j-1.2-api/src/test/java" +#JAVA_TEST_RESOURCE_DIRS=( +# "log4j-1.2-api/src/test/resources" +#) diff --git a/dev-java/log4j-api/Manifest b/dev-java/log4j-api/Manifest index 0116f1a3571a..71eb0f57dfac 100644 --- a/dev-java/log4j-api/Manifest +++ b/dev-java/log4j-api/Manifest @@ -1 +1,2 @@ DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176 +DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b diff --git a/dev-java/log4j-api/log4j-api-2.18.0.ebuild b/dev-java/log4j-api/log4j-api-2.18.0.ebuild new file mode 100644 index 000000000000..b46220565365 --- /dev/null +++ b/dev-java/log4j-api/log4j-api-2.18.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom log4j-api/pom.xml --download-uri mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.18.0.ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.logging.log4j:log4j-api:2.18.0" +JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="The Apache Log4j API" +HOMEPAGE="https://logging.apache.org/log4j/2.x/" +SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +# junit-{jupiter,vintage} is not available in ::gentoo +RESTRICT="test" + +# Compile dependencies +# POM: ${PN}/pom.xml +# org.osgi:org.osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0 +# POM: ${PN}/pom.xml +# test? com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0 +# test? com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0 +# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6 +# test? org.apache.felix:org.apache.felix.framework:7.0.5 -> !!!groupId-not-found!!! +# test? org.apache.maven:maven-core:3.8.5 -> !!!groupId-not-found!!! +# test? org.assertj:assertj-core:3.23.1 -> !!!suitable-mavenVersion-not-found!!! +# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!! +# test? org.junit-pioneer:junit-pioneer:1.6.2 -> !!!groupId-not-found!!! +# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!! +# test? org.junit.jupiter:junit-jupiter-migrationsupport:5.8.2 -> !!!groupId-not-found!!! +# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!! +# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!! +# test? uk.org.webcompere:system-stubs-jupiter:2.0.1 -> !!!groupId-not-found!!! + +DEPEND=" + >=virtual/jdk-1.8:* + dev-java/osgi-core:0 +" +# test? ( +# !!!groupId-not-found!!! +# !!!suitable-mavenVersion-not-found!!! +# >=dev-java/commons-lang-3.12.0:3.6 +# >=dev-java/jackson-core-2.13.3:0 +# >=dev-java/jackson-databind-2.13.3:0 +# ) +# " + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md ) + +S="${WORKDIR}/apache-log4j-${PV}-src" + +JAVA_CLASSPATH_EXTRA="osgi-core" +JAVA_SRC_DIR="${PN}/src/main/java" +JAVA_RESOURCE_DIRS="${PN}/src/main/resources" + +# JAVA_TEST_GENTOO_CLASSPATH="jackson-core,jackson-databind,commons-lang-3.6,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!" +# JAVA_TEST_SRC_DIR="${PN}/src/test/java" +# JAVA_TEST_RESOURCE_DIRS=( +# "${PN}/src/test/resources" +# ) diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest index 0116f1a3571a..71eb0f57dfac 100644 --- a/dev-java/log4j-core/Manifest +++ b/dev-java/log4j-core/Manifest @@ -1 +1,2 @@ DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176 +DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b diff --git a/dev-java/log4j-core/log4j-core-2.18.0.ebuild b/dev-java/log4j-core/log4j-core-2.18.0.ebuild new file mode 100644 index 000000000000..c89b20c08cd1 --- /dev/null +++ b/dev-java/log4j-core/log4j-core-2.18.0.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom log4j-core/pom.xml --download-uri mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.18.0.ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.logging.log4j:log4j-core:2.18.0" +# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="The Apache Log4j Implementation" +HOMEPAGE="https://logging.apache.org/log4j/2.x/" +SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +# We don't have junit-vintage and junit-jupiter +RESTRICT="test" + +# Common dependencies +# POM: ${PN}/pom.xml +# com.conversantmedia:disruptor:1.2.15 -> >=dev-java/conversant-disruptor-1.2.19:0 +# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0 +# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0 +# com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3 -> >=dev-java/jackson-dataformat-xml-2.13.3:0 +# com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3 -> >=dev-java/jackson-dataformat-yaml-2.13.3:0 +# com.fasterxml.woodstox:woodstox-core:6.2.8 -> >=dev-java/woodstox-core-6.2.8:0 +# com.lmax:disruptor:3.4.4 -> >=dev-java/lmax-disruptor-3.4.4:0 +# org.apache.commons:commons-compress:1.21 -> >=dev-java/commons-compress-1.21:0 +# org.apache.commons:commons-csv:1.9.0 -> >=dev-java/commons-csv-1.9.0:0 +# org.apache.kafka:kafka-clients:1.1.1 -> >=dev-java/kafka-clients-1.1.1:0 +# org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2 +# org.fusesource.jansi:jansi:2.4.0 -> >=dev-java/jansi-2.4.0:2 +# org.jctools:jctools-core:3.3.0 -> !!!suitable-mavenVersion-not-found!!! +# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0 +# org.zeromq:jeromq:0.5.2 -> >=dev-java/jeromq-0.5.2:0 + +CP_DEPEND=" + dev-java/commons-compress:0 + dev-java/commons-csv:0 + dev-java/conversant-disruptor:0 + dev-java/jackson-core:0 + dev-java/jackson-databind:0 + dev-java/jackson-dataformat-xml:0 + dev-java/jackson-dataformat-yaml:0 + dev-java/jansi:2 + dev-java/javax-mail:0 + dev-java/jctools-core:3 + dev-java/jeromq:0 + dev-java/kafka-clients:0 + dev-java/lmax-disruptor:0 + ~dev-java/log4j-api-${PV}:2 + dev-java/slf4j-api:0 + dev-java/woodstox-core:0 +" + +# Compile dependencies +# POM: ${PN}/pom.xml +# javax.activation:javax.activation-api:1.2.0 -> !!!groupId-not-found!!! +# javax.jms:javax.jms-api:2.0.1 -> !!!groupId-not-found!!! +# javax.mail:javax.mail-api:1.6.2 -> !!!groupId-not-found!!! +# org.osgi:org.osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0 +# POM: ${PN}/pom.xml +# test? ch.qos.logback:logback-classic:1.2.11 -> >=dev-java/logback-classic-1.2.11:0 +# test? ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0 +# test? com.github.tomakehurst:wiremock:2.26.3 -> !!!groupId-not-found!!! +# test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0 -> !!!groupId-not-found!!! +# test? com.h2database:h2:2.1.214 -> !!!groupId-not-found!!! +# test? commons-codec:commons-codec:1.15 -> >=dev-java/commons-codec-1.15:0 +# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1 +# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0 +# test? net.javacrumbs.json-unit:json-unit:2.32.0 -> !!!groupId-not-found!!! +# test? org.apache-extras.beanshell:bsh:2.0b6 -> >=dev-java/bsh-2.0_beta6:0 +# test? org.apache.activemq:activemq-broker:5.17.1 -> !!!groupId-not-found!!! +# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6 +# test? org.apache.felix:org.apache.felix.framework:7.0.5 -> !!!groupId-not-found!!! +# test? org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2 +# test? org.apache.maven:maven-core:3.8.5 -> !!!groupId-not-found!!! +# test? org.awaitility:awaitility:4.2.0 -> !!!groupId-not-found!!! +# test? org.codehaus.groovy:groovy-dateutil:3.0.10 -> !!!groupId-not-found!!! +# test? org.codehaus.groovy:groovy-jsr223:3.0.10 -> !!!groupId-not-found!!! +# test? org.codehaus.plexus:plexus-utils:3.4.2 -> !!!groupId-not-found!!! +# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!! +# test? org.hamcrest:hamcrest:2.2 -> >=dev-java/hamcrest-2.2:0 +# test? org.hsqldb:hsqldb:2.5.2 -> !!!groupId-not-found!!! +# test? org.jmdns:jmdns:3.5.7 -> !!!groupId-not-found!!! +# test? org.junit-pioneer:junit-pioneer:1.6.2 -> !!!groupId-not-found!!! +# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!! +# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!! +# test? org.junit.platform:junit-platform-commons:1.8.2 -> !!!groupId-not-found!!! +# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!! +# test? org.mockito:mockito-core:4.4.0 -> >=dev-java/mockito-4.4.0:4 +# test? org.mockito:mockito-junit-jupiter:4.4.0 -> !!!artifactId-not-found!!! +# test? org.slf4j:slf4j-ext:1.7.36 -> >=dev-java/slf4j-ext-1.7.36:0 +# test? org.springframework:spring-test:5.3.20 -> !!!groupId-not-found!!! +# test? org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0 +# test? org.xmlunit:xmlunit-core:2.9.0 -> !!!groupId-not-found!!! +# test? org.xmlunit:xmlunit-matchers:2.9.0 -> !!!groupId-not-found!!! +# test? org.zapodot:embedded-ldap-junit:0.8.1 -> !!!groupId-not-found!!! + +DEPEND="${CP_DEPEND} + dev-java/jakarta-activation-api:1 + dev-java/jakarta-mail-api:0 + dev-java/javax-jms-api:0 + dev-java/osgi-core-api:0 + >=virtual/jdk-1.8:*" +# test? ( +# !!!artifactId-not-found!!! +# !!!groupId-not-found!!! +# >=dev-java/bsh-2.0_beta6:0 +# >=dev-java/commons-codec-1.15:0 +# >=dev-java/commons-io-2.11.0:1 +# >=dev-java/commons-lang-3.12.0:3.6 +# >=dev-java/commons-logging-1.2:0 +# >=dev-java/hamcrest-2.2:0 +# >=dev-java/log4j-api-2.18.0:2 +# >=dev-java/logback-classic-1.2.11:0 +# >=dev-java/logback-core-1.2.11:0 +# >=dev-java/mockito-4.4.0:4 +# >=dev-java/slf4j-ext-1.7.36:0 +# >=dev-java/xz-java-1.9:0 +# ) +#" + +# Runtime dependencies +# POM: ${PN}/pom.xml +# com.sun.mail:javax.mail:1.6.2 -> !!!artifactId-not-found!!! + +RDEPEND=" + >=virtual/jre-1.8:* + ${CP_DEPEND}" + +DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md ) + +S="${WORKDIR}/apache-log4j-${PV}-src" + +JAVA_CLASSPATH_EXTRA="jakarta-activation-api-1,jakarta-mail-api,javax-jms-api,osgi-core-api" +JAVA_SRC_DIR="${PN}/src/main/java" +JAVA_RESOURCE_DIRS="${PN}/src/main/resources" + +#JAVA_TEST_GENTOO_CLASSPATH="logback-classic,logback-core,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-codec,commons-io-1,commons-logging,!!!groupId-not-found!!!,bsh,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,hamcrest,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,mockito-4,!!!artifactId-not-found!!!,slf4j-ext,!!!groupId-not-found!!!,xz-java,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!" +#JAVA_TEST_SRC_DIR="${PN}/src/test/java" +#JAVA_TEST_RESOURCE_DIRS=( +# "${PN}/src/test/resources" +#) + +src_compile() { + java-pkg-simple_src_compile + + # Process the @Plugin annotation used on Log4j 2 built-in plugins + # to generate a serialized plugin listing file + # https://logging.apache.org/log4j/2.x/manual/plugins.html + local processor="org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor" + local classes="target/classes" + local classpath="${JAVA_JAR_FILENAME}:$(\ + java-pkg_getjars --build-only --with-dependencies \ + "${JAVA_GENTOO_CLASSPATH},${JAVA_CLASSPATH_EXTRA}")" + # Just in case java-pkg-simple.eclass changes the path in the future + mkdir -p "${classes}" || die "Failed to create directory for classes" + local sources_list_file="${T}/sources.lst" + find "${JAVA_SRC_DIR}" -type f -name "*.java" > "${sources_list_file}" || die + ejavac -d "${classes}" -cp "${classpath}" \ + -proc:only -processor "${processor}" \ + @"${sources_list_file}" + # Update the JAR to include the serialized plugin listing file + local jar="$(java-config -j)" + "${jar}" -uf "${JAVA_JAR_FILENAME}" -C "${classes}" . || + die "Failed to update JAR" +} diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest index 6c6df424f4a8..42cb97a35ce9 100644 --- a/dev-java/mockito/Manifest +++ b/dev-java/mockito/Manifest @@ -1,4 +1,3 @@ DIST mockito-1.9.5.zip 6453870 BLAKE2B b577c4a82f03b5c345462ecc10e9fe25c03836d08d57d633d95a1eaba17f52d4306603f50f332df360d0a4880c85c65bad4503503df0acad8f7b437694a2b887 SHA512 93768992c74fbc2e2653b46b3afb526ab816b9c707cb5f9608564299ffd206e256182be146c590b4777a624379f576d7117ed7d43b11f8d2974e87c402eede51 -DIST mockito-4.4.0.tar.gz 1030274 BLAKE2B 41b64456b8bf083f69889fdf7fb891a0bb790af8eb897fd0ba5ceca47050944fec102c33badcf6a68621a9fadc33439405b9ca307794f865637c3143c474ba3d SHA512 f0f4c3f585aad63a357d8b8f924124961e7fffdf95607945ae073ab32a05be6ff08794d3edfc60dea21b65ef7c827a4872315c2372d6a9aa822cf8700a08025f DIST mockito-4.6.0.tar.gz 1030497 BLAKE2B 0afc0f5874acbd290312a7eee2ce8b9f7d1a83da12338ff8851e02cd6a9ed0c99bfc109fade5ddfec5f9a5277ffaa0d04c53a726c31082dc53b512a2e551473b SHA512 18f76788e610ca169cf6b4eefd0fdd78c333b920122115d816d1f2ab94f0a84d5a9fd0d00d41d1c34e592c5634f7ac55f7f491061b7992d18aa69f3fc62561b6 DIST mockito-4.6.1.tar.gz 1031362 BLAKE2B 52768ead8770c701f5e5b698f9c35e8e189b57979d90b231b434aba57f6f1f167e5f1491eec53280ce29410add31ac41e81b3637257f58709162cc3c5307ed27 SHA512 f16454f3baba2e55a6da229d7719359357b2641cf4abaf3c0e5f5cac6999325ac4a9c08d815a02939c1ef62831745162935bb8d03177a27b0d972600a92fc1f7 diff --git a/dev-java/mockito/mockito-4.4.0.ebuild b/dev-java/mockito/mockito-4.4.0.ebuild deleted file mode 100644 index 676fcb4d2985..000000000000 --- a/dev-java/mockito/mockito-4.4.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Tests not enabled, wants junit-jupiter. -# "${S}/settings.gradle.kts" -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.mockito:mockito-core:4.4.0" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Mockito mock objects library core API and implementation" -HOMEPAGE="https://github.com/mockito/mockito" -SRC_URI="https://codeload.github.com/mockito/mockito/tar.gz/v${PV} -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: ${PN}-core-${PV}.pom -# net.bytebuddy:byte-buddy:1.12.8 -> >=dev-java/byte-buddy-1.12.8:0 -# net.bytebuddy:byte-buddy-agent:1.12.8 -> >=dev-java/byte-buddy-agent-1.12.8:0 - -CP_DEPEND=" - dev-java/byte-buddy:0 - dev-java/byte-buddy-agent:0 - dev-java/junit:4 - dev-java/objenesis:0 - dev-java/opentest4j:0 -" - -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND} -" - -# Runtime dependencies -# POM: ${PN}-core-${PV}.pom -# org.objenesis:objenesis:3.2 -> >=dev-java/objenesis-3.2:0 - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND} -" - -S="${WORKDIR}/${P}" - -JAVA_SRC_DIR="src/main/java" - -src_install() { - java-pkg-simple_src_install - einstalldocs # https://bugs.gentoo.org/789582 -} diff --git a/dev-java/mockito/mockito-4.6.0.ebuild b/dev-java/mockito/mockito-4.6.0.ebuild index 694a4406541b..64fd58db303e 100644 --- a/dev-java/mockito/mockito-4.6.0.ebuild +++ b/dev-java/mockito/mockito-4.6.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="4" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Common dependencies # POM: ${PN}-core-${PV}.pom diff --git a/dev-java/osgi-annotation/Manifest b/dev-java/osgi-annotation/Manifest new file mode 100644 index 000000000000..19b5e3b7afc0 --- /dev/null +++ b/dev-java/osgi-annotation/Manifest @@ -0,0 +1 @@ +DIST osgi-annotation-8.1.0.jar 35775 BLAKE2B 404b78ead0693c2c5ade4dc9415f6b3f80d8a58933a466845bfbb6b2fb0dd4a479ad1cf392a12a18dc951755089e60dbc5f3a20a60ecbbeb23a7224b1c1ae9d2 SHA512 cfddedf01b873f51b8b0b129dfbfae547645eed3d8c2b59b6d940f9163c0809876fc0043f7b66e764215aab8136737e3c969d0d495e33330e8ae82b4c35c3132 diff --git a/dev-java/osgi-annotation/metadata.xml b/dev-java/osgi-annotation/metadata.xml new file mode 100644 index 000000000000..75321cfb5598 --- /dev/null +++ b/dev-java/osgi-annotation/metadata.xml @@ -0,0 +1,7 @@ + + + + + java@gentoo.org + + diff --git a/dev-java/osgi-annotation/osgi-annotation-8.1.0.ebuild b/dev-java/osgi-annotation/osgi-annotation-8.1.0.ebuild new file mode 100644 index 000000000000..4c5826cb0bc6 --- /dev/null +++ b/dev-java/osgi-annotation/osgi-annotation-8.1.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.osgi:osgi.annotation:8.1.0" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="OSGi Annotation Release 8, Annotations for use in compiling bundles" +HOMEPAGE="https://www.osgi.org" +SRC_URI="https://docs.osgi.org/download/r$(ver_cut 1)/${PN/-/.}-${PV}.jar -> ${P}.jar" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +RDEPEND=">=virtual/jre-1.8:*" +DEPEND=">=virtual/jdk-1.8:*" +BDEPEND="app-arch/unzip" + +JAVA_SRC_DIR="OSGI-OPT/src" + +src_prepare() { + default + java-pkg_clean org +} diff --git a/dev-java/osgi-core/Manifest b/dev-java/osgi-core/Manifest new file mode 100644 index 000000000000..fefbfdfc2580 --- /dev/null +++ b/dev-java/osgi-core/Manifest @@ -0,0 +1 @@ +DIST osgi-core-8.0.0.jar 556893 BLAKE2B 36c923ed2a0c590690d1fae112b56984ac16aab7ab0ce46b715aad8fc7b75f0846d640121ced62c626adb1b442c0cb524df37cb82339e9405db6abc7b67c64d9 SHA512 0161f91ecb8ad102731c71ce73f96b99174b5bce2f216770226860cff8a3fcd12abec828399077a835b6765ed9bf9ec29be618de8d2a85b40d6250c00bab4404 diff --git a/dev-java/osgi-core/metadata.xml b/dev-java/osgi-core/metadata.xml new file mode 100644 index 000000000000..75321cfb5598 --- /dev/null +++ b/dev-java/osgi-core/metadata.xml @@ -0,0 +1,7 @@ + + + + + java@gentoo.org + + diff --git a/dev-java/osgi-core/osgi-core-8.0.0.ebuild b/dev-java/osgi-core/osgi-core-8.0.0.ebuild new file mode 100644 index 000000000000..5a9c45902f89 --- /dev/null +++ b/dev-java/osgi-core/osgi-core-8.0.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.osgi:osgi.core:8.0.0" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="OSGi Service Platform Core API (Companion Code)" +HOMEPAGE="https://www.osgi.org" +SRC_URI="https://docs.osgi.org/download/r$(ver_cut 1)/${PN/-/.}-${PV}.jar -> ${P}.jar" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +RDEPEND=">=virtual/jre-1.8:*" + +DEPEND=" + dev-java/osgi-annotation:0 + >=virtual/jdk-1.8:*" + +BDEPEND="app-arch/unzip" + +JAVA_CLASSPATH_EXTRA="osgi-annotation" +JAVA_SRC_DIR="OSGI-OPT/src" + +src_prepare() { + default + java-pkg_clean org +} diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz index 1a16b0c483cf..b0ffc8f40bfa 100644 Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index daa5599993c2..6833102a87c3 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,3 +1,5 @@ DIST php-7.4.30.tar.xz 10419136 BLAKE2B 5860ead4051173d3139f93be24f15c7ed2044a9e6b3488234aaca73dff8abace3adf00bde782c3fc950d81d2dfdb67979bb5b99c3587d07f5ccbe782d9cba37d SHA512 7bce44a23c07193c10c57459f08b08fdce4e3a269d6829a61371d1b1f117ecf4e167805a40e1a5e7687f534aee9d5f5745a3f4dcb344e9e781c105bc964ed738 DIST php-8.0.20.tar.xz 10879064 BLAKE2B 3b18d6593ddc78e1c289b87ba8bb65e55cbd815d2b06d4f9759265e9ae76ea6b78dc9f52652be1b1a721ccfe736f80d2a8f59c01ba4c38a8ff46710753bcc9ed SHA512 24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa +DIST php-8.0.21.tar.xz 10785364 BLAKE2B ea8a640b47c96b235b49ce3a98accbfa4aa967c7e917684e19667a74ca0f77e070847dabdf15c3dbd56cff01ef662e79e9408d3e57e870e51893e969291a0932 SHA512 c1c1577f3d6af445d8ac15338877186f2a639a76ad980328011cb0a5e9592bdb24c1cda7ae8a0c495c881497d54cbca6e1373ede71bf097e69a040368841d567 DIST php-8.1.7.tar.xz 11718520 BLAKE2B 145fdff9ec4ce72d4f4626b1cb11674240db4830c5ffda1cdfaa807b195d40ea70afe69ae702a2ba256961ba810b9de5151bef20352eaa98553c837c65d730e3 SHA512 1d72db220f3485310e02b67c41dd6434c26b7118f673ba7f425ff6b79cc96c86fc45bfe9c90b302d719eb9b7a5334f363a92ac309c367aacc93ab31a72a63c45 +DIST php-8.1.8.tar.xz 11722100 BLAKE2B 117e0823b47485d4fc469edfbc5e9051b5d35588bf36a2d9e12282b83c12056cfc2a4376bf0e21b5f947190a906e3e4fdde7bec20b7ea7e9ab36912e865c2c13 SHA512 4ef03b4c412bdbcdf6c3dc4784b3218a0519e6b91a0682e796270d4426c05c62309b4835ea31271857a5f2535d00f20a9f9b4a79703a49c3e40f16fafa948dd4 diff --git a/dev-lang/php/php-8.0.21.ebuild b/dev-lang/php/php-8.0.21.ebuild new file mode 100644 index 000000000000..c9ead2270c39 --- /dev/null +++ b/dev-lang/php/php-8.0.21.ebuild @@ -0,0 +1,758 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +WANT_AUTOMAKE="none" + +inherit flag-o-matic systemd autotools + +MY_PV=${PV/_rc/rc} +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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +S="${WORKDIR}/${PN}-${MY_PV}" + +# 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 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 ) + 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] + fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) + argon2? ( app-crypt/argon2:= ) + 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? ( >=virtual/imap-c-client-2[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.1: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= ) +" + +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}/php80-firebird-warnings.patch" +) + +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 || 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}" + + # 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 + $(use_enable threads zts) + ) + + our_conf+=( + $(use_with apparmor fpm-apparmor) + $(use_with argon2 password-argon2 "${EPREFIX}/usr") + $(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 + local mysqllib="mysqlnd" + local mysqlilib="mysqlnd" + + our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) + + 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 "${mysqllib}") + $(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.8.ebuild b/dev-lang/php/php-8.1.8.ebuild new file mode 100644 index 000000000000..7e88fdac09a1 --- /dev/null +++ b/dev-lang/php/php-8.1.8.ebuild @@ -0,0 +1,759 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +WANT_AUTOMAKE="none" + +inherit flag-o-matic systemd autotools + +MY_PV=${PV/_rc/RC} +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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +S="${WORKDIR}/${PN}-${MY_PV}" + +# 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 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 ) + 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] + fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) + argon2? ( app-crypt/argon2:= ) + 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? ( >=virtual/imap-c-client-2[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" +) + +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 || 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}" + + # 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 + $(use_enable threads zts) + ) + + our_conf+=( + $(use_with apparmor fpm-apparmor) + $(use_with argon2 password-argon2 "${EPREFIX}/usr") + $(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 + local mysqllib="mysqlnd" + local mysqlilib="mysqlnd" + + our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) + + 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 "${mysqllib}") + $(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/python/Manifest b/dev-lang/python/Manifest index 7b28258b3088..2ba513e0d96f 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -16,6 +16,7 @@ DIST python-gentoo-patches-2.7.18_p15.tar.xz 34956 BLAKE2B d173f276dd9c0ce31004d DIST python-gentoo-patches-3.10.4.tar.xz 8592 BLAKE2B 67fba3e1fedb17430e5cd93da995b4acaf714db512031b5a2f775a25f793f007941561663cfa413d645ccddc2e22d65d250a40fa166cafda8805488d877ff57d SHA512 3ed2b8ff8f1eb8febe7dcd4b5d13d6d54468be1d525f8f1118977d3bbc78f690a597b09383939d023b03380a306e4bff1693382e29ff562312d803305b1709b2 DIST python-gentoo-patches-3.10.5.tar.xz 8584 BLAKE2B d4a812a33e485b1eae5629e519dca4dc6625b743b07c7f7bbc62562f345d87723ba499893702310b1e96e443d2946e27a8d4971f32ca1125d4827d0d594ccaa6 SHA512 77f0478f7d0491e103857a83a97d6e04a9ec68740a7f9357cbbdd316462e7d98ea8236bd05a30e7556457ece5fbcfa4a7a78a25d4eb12779455ce2bb5b6f30d0 DIST python-gentoo-patches-3.11.0b3.tar.xz 3320 BLAKE2B 588762fe2698a814d0cb89f84620d3ca4754347cb9af4f0eb36429a126ca2386b64594f16621a25e88d518986aad5f3ef3a84d9ce746f58b5cc6d112167c41d1 SHA512 026cb5cc2f3a1b17829fb088ca1dc9af03764a250bebb1fe518a6f7734f731a3f6cc5d83a13b6ca29dd6fa8ca5f0249a7ef0a641b939cd511d05cdc645b9171f +DIST python-gentoo-patches-3.11.0b3_p1.tar.xz 10560 BLAKE2B 4a34de0595490b0e7fcff1761954bfa56f3f82cfdf5a26d739f410e355f9068ccb22a24af0c212543b1288682a9737e4202862c9d4db2f78d08a5a33f80c85e8 SHA512 a0e54b3dd16db8802b93b88ad50bb979b90052a53438fcbf8378288747b627133a492a9071600d7c11163cb9a61c4c80f9b1dd1fc843789aa7507488ff2c1337 DIST python-gentoo-patches-3.8.13.tar.xz 16004 BLAKE2B 5c0c6c9263570a467391e60c324d1dbc1e50ffda9cad1e204df124441b593146f18e5f1529eb7d385b35c5f4b9e597807971b6b66f7f8eef156ad87c9ad32743 SHA512 4ceb831e2d62bd73909b53a3b553b2cd73d08bcf2a1c92b47eaeb1221d40daabcaed14977265bcb265df00b6bf363dbebbd61a62dca4bf6ef40c6b911e980597 DIST python-gentoo-patches-3.8.13_p2.tar.xz 18816 BLAKE2B 8612ca33e5569319c5d1a5a3fb1a81e860bd515bfde656b79f087ccf7020923fbd06b315178bef8630e4c36bb22c27299fe439aadc6a161f1ec93be8778314ee SHA512 be5668a0a4be0a03e61466436973125a3be4f33a61524e4a5c8d86745727cfcae59e5048477887c9f6bfc09727f3aef3652ad47a13a6bf0f1452d3172f1c34dc DIST python-gentoo-patches-3.9.12.tar.xz 12848 BLAKE2B 5dd66fa94b136a463d2c4be3a5b7dfad770c3905467a1d81af02a35b2783ce7d614881c915ee8f8e764c1656963d6886d9c60c6e524f512e1bc496e42d01307b SHA512 07de63e47a8e547724099062239df8fcfd254f19d38be28131e6bbb094ffbab8483861fb6a5905e60d7fa7a1a5dc06785951fa31984ecad89516b0b742c47f91 diff --git a/dev-lang/python/python-3.11.0_beta3_p1.ebuild b/dev-lang/python/python-3.11.0_beta3_p1.ebuild new file mode 100644 index 000000000000..495c081c3261 --- /dev/null +++ b/dev-lang/python/python-3.11.0_beta3_p1.ebuild @@ -0,0 +1,469 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs verify-sig + +MY_PV=${PV/_beta/b} +MY_P="Python-${MY_PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${MY_PV}" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE=" + https://www.python.org/ + https://github.com/python/cpython/ +" +SRC_URI=" + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc + ) +" +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" +IUSE="bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND=" + app-arch/bzip2:= + app-arch/xz-utils:= + app-crypt/libb2 + >=dev-libs/expat-2.1:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( + !libedit? ( >=sys-libs/readline-4.1:= ) + libedit? ( dev-libs/libedit:= ) + ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( >=dev-libs/openssl-1.1.1:= ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + !! /dev/null || die + ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}" + + # Avoid as many dependencies as possible for the cross build. + cat >> Makefile <<-EOF || die + MODULE_NIS=disabled + MODULE__DBM=disabled + MODULE__GDBM=disabled + MODULE__DBM=disabled + MODULE__SQLITE3=disabled + MODULE__HASHLIB=disabled + MODULE__SSL=disabled + MODULE__CURSES=disabled + MODULE__CURSES_PANEL=disabled + MODULE_READLINE=disabled + MODULE__TKINTER=disabled + MODULE_PYEXPAT=disabled + MODULE_ZLIB=disabled + EOF + + # Unfortunately, we do have to build this immediately, and + # not in src_compile, because CHOST configure for Python + # will check the existence of the --with-build-python value + # immediately. + emake + popd &> /dev/null || die + fi + + econf "${myeconfargs[@]}" + + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi + + # force-disable modules we don't want built + local disable_modules=( + NIS + ) + use gdbm || disable_modules+=( _GDBM _DBM ) + use sqlite || disable_modules+=( _SQLITE3 ) + use ssl || disable_modules+=( _HASHLIB _SSL ) + use ncurses || disable_modules+=( _CURSES _CURSES_PANEL ) + use readline || disable_modules+=( READLINE ) + use tk || disable_modules+=( _TKINTER ) + + local mod + for mod in "${disable_modules[@]}"; do + echo "MODULE_${mod}=disabled" + done >> Makefile || die +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + # Prevent using distutils bundled by setuptools. + # https://bugs.gentoo.org/823728 + export SETUPTOOLS_USE_DISTUTILS=stdlib + export PYTHONSTRICTEXTENSIONBUILD=1 + + # Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't + # end up writing bytecode & violating sandbox. + # bug #831897 + local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE} + + if use pgo ; then + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + + addpredict /usr/lib/python3.11/site-packages + fi + + # also need to clear the flags explicitly here or they end up + # in _sysconfigdata* + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Restore saved value from above. + local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE} + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="gdb" + + if use sparc ; then + # bug #788022 + skipped_tests+=" multiprocessing_fork" + skipped_tests+=" multiprocessing_forkserver" + fi + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # Expects to find skipped tests and fails + mv "${S}"/Lib/test/test_tools/test_freeze.py "${T}" || die + + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + # workaround https://bugs.gentoo.org/775416 + addwrite /usr/lib/python3.11/site-packages + + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + + emake test EXTRATESTOPTS="-u-network -j${jobs}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + mv "${T}"/test_freeze.py "${S}"/Lib/test/test_tools/test_freeze.py || die + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + # -j1 hack for now for bug #843458 + emake -j1 DESTDIR="${D}" altinstall + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + use sqlite || rm -r "${libdir}/"sqlite3 || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + local -x EPYTHON=python${PYVER} + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + cat > python.wrap <<-EOF || die + #!/bin/sh + export LD_LIBRARY_PATH=\${PWD}\${LD_LIBRARY_PATH+:\${LD_LIBRARY_PATH}} + exec ./python "\${@}" + EOF + chmod +x python.wrap || die + local -x PYTHON=./python.wrap + else + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${scriptdir}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die + fi +} diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index c002d2f92eb7..db8d71ae5f95 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/capnproto/Manifest b/dev-libs/capnproto/Manifest index fa59d90435d7..bedc589fb927 100644 --- a/dev-libs/capnproto/Manifest +++ b/dev-libs/capnproto/Manifest @@ -1 +1,2 @@ +DIST capnproto-0.10.2.tar.gz 2279393 BLAKE2B d78442bc122bc976fb636dfde694e10414bf3468ead903fac7ba59cbd81a49ce94969954fdc90f92f7f58f0af80f2da1f70de9b461d99fc6ae9a9e7aa9cd0500 SHA512 079ab715ea19ac207f72bb4874ab6362c11dfb9128342ec937e3f4d27e4100530cf9e6a0275eaca1e45a1bb706b65179a526ea8cfceba93bb36cd6c4f1c0cf5b DIST capnproto-0.9.1.tar.gz 2238849 BLAKE2B f8de56c7f79b0ddad35f3e8fec7740510ca2328e4ddc633a71420901d3fc44df44d807c3965213dfc2535bbe03832c5164242d33cd0bff901d6f288fb62bab21 SHA512 bdc5960f26214139744d768ca4558b085e2d359c375a8849ca532a4c458a2daf0ee1a1f4d00745de5abf353aa1e4084a2d85e5523006f23f591f21fac2d847fd diff --git a/dev-libs/capnproto/capnproto-0.10.2.ebuild b/dev-libs/capnproto/capnproto-0.10.2.ebuild new file mode 100644 index 000000000000..0a6728f73a19 --- /dev/null +++ b/dev-libs/capnproto/capnproto-0.10.2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +DESCRIPTION="RPC/Serialization system with capabilities support" +HOMEPAGE="https://capnproto.org" +SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${P}/c++ + +LICENSE="MIT" +SLOT="0/091" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ssl test zlib" + +RESTRICT="!test? ( test )" + +RDEPEND=" + ssl? ( dev-libs/openssl:0= ) + zlib? ( sys-libs/zlib:0= ) +" +DEPEND="${RDEPEND} + test? ( dev-cpp/gtest ) +" + +src_configure() { + if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then + # append-libs won't work here, cmake doesn't respect it + # ... and ldflags gets missed once + append-flags -latomic + fi + + local mycmakeargs=( + -DWITH_OPENSSL=$(usex ssl) + -DBUILD_TESTING=$(usex test) + $(cmake_use_find_package zlib ZLIB) + ) + cmake_src_configure +} + +src_test() { + cmake_build check +} diff --git a/dev-libs/castxml/Manifest b/dev-libs/castxml/Manifest new file mode 100644 index 000000000000..11a4f5007da9 --- /dev/null +++ b/dev-libs/castxml/Manifest @@ -0,0 +1 @@ +DIST castxml-0.4.5.tar.gz 104158 BLAKE2B 7d1642442d6908a7d7e1dd8f80a37b55ec8652191c4c93faf7f45601d730653d9b0e5af601f74aca7bce8579c0006eab0e9a2a75752abe2acbec1cfbf1522645 SHA512 c35c5d60dc7487d5dddba34de92590122db8457659458ee4e735fe9936dc59473bd31ed602e05e73651780f25a55ef5554e2daec0923ffb5a7575904320f5352 diff --git a/dev-libs/castxml/castxml-0.4.5.ebuild b/dev-libs/castxml/castxml-0.4.5.ebuild new file mode 100644 index 000000000000..35603a9ecafd --- /dev/null +++ b/dev-libs/castxml/castxml-0.4.5.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="C-family abstract syntax tree XML output tool" +HOMEPAGE="https://github.com/CastXML/CastXML" +SRC_URI="https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +S="${WORKDIR}/CastXML-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + sys-devel/llvm:= + sys-devel/clang:= + " +DEPEND="${RDEPEND}" +BDEPEND=" + ${RDEPEND} + dev-python/sphinx + " + +src_configure() { + local mycmakeargs=( + -DCastXML_INSTALL_DOC_DIR="share/doc/${P}" + -DCastXML_INSTALL_MAN_DIR="share/man" + -DSPHINX_MAN=ON + -DSPHINX_HTML=OFF + -DBUILD_TESTING="$(usex test)" + ) + cmake_src_configure +} diff --git a/dev-libs/castxml/metadata.xml b/dev-libs/castxml/metadata.xml new file mode 100644 index 000000000000..642c87f3644f --- /dev/null +++ b/dev-libs/castxml/metadata.xml @@ -0,0 +1,12 @@ + + + + + + tomjbe@gentoo.org + Thomas Beierlein + + + radio@gentoo.org + + diff --git a/dev-libs/elfutils/elfutils-0.187.ebuild b/dev-libs/elfutils/elfutils-0.187.ebuild index 1db301f35330..c26702d09daf 100644 --- a/dev-libs/elfutils/elfutils-0.187.ebuild +++ b/dev-libs/elfutils/elfutils-0.187.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2. LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" -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" IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd" RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest index 31f7cd5bada5..007b9bf727aa 100644 --- a/dev-libs/kopeninghours/Manifest +++ b/dev-libs/kopeninghours/Manifest @@ -1,2 +1,2 @@ DIST kopeninghours-21.12.3.tar.xz 68916 BLAKE2B d80275c195231ca52e0042149d685224c9ffadd6d341ddce1af6f46df451442e924f282119c91ab004dcabb64b112de559bbbcddc2a91daee5cf9a76b84fb4bb SHA512 42bdbe8172ff5ff89469786f3d544db4a07bc0d1de9a54b8525dc8789d0f4328159ee815c07595463f190073433de567fb2d3496d261daa46aac70354b3da6ae -DIST kopeninghours-22.04.2.tar.xz 69172 BLAKE2B 7117c219aac659df2725cf2600cdafa4a676937303fe4bc8e151108759790a8123aa896f51ce3eb8f91477a5911d0d459791ff4b8cb73c45781223339a482ef3 SHA512 f27993e33922dd260c4a7b67cede7c0155ccb5f8b7d30a4fa9e1fe1fa4b80d3f0dd613edf06a0bade43a77bcfc1f8aa2173fbc7f2b4fa659948395b2c3554c3e +DIST kopeninghours-22.04.3.tar.xz 69160 BLAKE2B 8875d1ee869c6cae8730e83ff8144e45a6ab24aff02ec85084022ab30f9274a2f7c5bd4e0bf88f27c3626ee580a6fac9e2446fa711823011b305ba9bdf1d88c9 SHA512 68e49cd35db2f381cfd88787ed2085e69c6485de87c2cd5783675784cb169d274115d9bc36cde6ed447d6cff6922278330ac1aa819a0d996f2a5b861f6f1bf7e diff --git a/dev-libs/kopeninghours/kopeninghours-22.04.2.ebuild b/dev-libs/kopeninghours/kopeninghours-22.04.3.ebuild similarity index 96% rename from dev-libs/kopeninghours/kopeninghours-22.04.2.ebuild rename to dev-libs/kopeninghours/kopeninghours-22.04.3.ebuild index 2f0dacc76970..84b2cccc98d6 100644 --- a/dev-libs/kopeninghours/kopeninghours-22.04.2.ebuild +++ b/dev-libs/kopeninghours/kopeninghours-22.04.3.ebuild @@ -8,8 +8,8 @@ ECM_TEST="true" KDE_GEAR="true" PVCUT=$(ver_cut 1-3) KFMIN=5.92.0 -QTMIN=5.15.3 -PYTHON_COMPAT=( python3_{8..10} ) +QTMIN=5.15.4 +PYTHON_COMPAT=( python3_{8..11} ) inherit ecm kde.org python-single-r1 DESCRIPTION="Library for parsing and evaluating OSM opening hours expressions" diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest index 5fb8f8cccfb9..77e95e9f43b8 100644 --- a/dev-libs/kosmindoormap/Manifest +++ b/dev-libs/kosmindoormap/Manifest @@ -1,2 +1,2 @@ DIST kosmindoormap-21.12.3.tar.xz 351272 BLAKE2B 8fde9196e18062770c63eb2b636bf3bfea65d8575f4d67106c28fcf3349c6d9bfa3bd1d48a8978b3ec2e2d027f89be3338b88cdfd4b59b7609cc9bba2aeab689 SHA512 f2f5bc04dbb9943114d9807787d98ad4a4963be556c5f2ec332c59bc60533abbf6d39b982f79264ff3d764cb4b8e60501d711039e0fc475500abbd800fc13b86 -DIST kosmindoormap-22.04.2.tar.xz 351236 BLAKE2B f2462e02da572a33bc46704aa3f59221494c085787c186976bfd35721b0eeeb8203aa052d8085e65c97c62b0b320076deae89692113137970b2b8a97c9c1f15d SHA512 f5887eb4f98f2d464aab00de89aac8487391b22075f34b5b861e6ede403feccad507727b07b7349f17b8a71b306dbb2e9a55054f32c13540014d8572189e929e +DIST kosmindoormap-22.04.3.tar.xz 351256 BLAKE2B c18ff31d5cd2b5e2d92bed51b6e6e7addf3319381ee3a200b372a6659aa4ac80d01d63898e2d29705374a23608d16463ab2f4daa77179fefa78038f34058e59b SHA512 f272b250142a4ae6275b0234ff3ebbadb1eebe2302d28286de47c230363bfd7f153574fad4a7f2ada3507db80552dce1f0fc49ae9db5427d144ce0bbc3052b5f diff --git a/dev-libs/kosmindoormap/kosmindoormap-22.04.2.ebuild b/dev-libs/kosmindoormap/kosmindoormap-22.04.3.ebuild similarity index 98% rename from dev-libs/kosmindoormap/kosmindoormap-22.04.2.ebuild rename to dev-libs/kosmindoormap/kosmindoormap-22.04.3.ebuild index db79b01a49e9..91ab8e7e3099 100644 --- a/dev-libs/kosmindoormap/kosmindoormap-22.04.2.ebuild +++ b/dev-libs/kosmindoormap/kosmindoormap-22.04.3.ebuild @@ -7,7 +7,7 @@ ECM_TEST="true" KDE_GEAR="true" PVCUT=$(ver_cut 1-3) KFMIN=5.92.0 -QTMIN=5.15.3 +QTMIN=5.15.4 inherit ecm kde.org DESCRIPTION="Data Model and Extraction System for Travel Reservation information" diff --git a/dev-libs/kpublictransport/Manifest b/dev-libs/kpublictransport/Manifest index dce978d7addd..03d201c0792c 100644 --- a/dev-libs/kpublictransport/Manifest +++ b/dev-libs/kpublictransport/Manifest @@ -1,2 +1,2 @@ DIST kpublictransport-21.12.3.tar.xz 480780 BLAKE2B 949c394497fcd76af7e4cc3d83e1db74cbef221f9f468a4ac247e82000503468e204eaa45ee61b4f5d05d84c1f4878484db342ff760d101a6a0a7b0960937baf SHA512 495fc7e92bab00fa0953fa81d2cb73e37055f8ccee899c8d9f8783e85f83e7f6a4c04a1e48ed607d565926bdc9fcadc539a2738b7c898a07aa6934f5e15038eb -DIST kpublictransport-22.04.2.tar.xz 485872 BLAKE2B bc820a67ac26f6ce52e38fad4021e3c432ba2e3ff28b0853e78cca2c6255d6e4e7a40e260b463b7cf23851b673b1b0a51fe97d7cde5c9614219d2c4177f082fc SHA512 77874baacb836ee7cc903122c88d88dcfb277d281aa2777195b701edd33a9293924ca6cd482529f2bebcdc20ee4edf954c53788fdc9951c23cd7cae774a2751a +DIST kpublictransport-22.04.3.tar.xz 485844 BLAKE2B 20fb25f8af055122e03e6219dacd6b40e1d79ec817cdfb4054ed0764a323c9e1435e4adc639ebd3ab68d7a0ceecb35a65554fadba0d3b31f40dd0150a64e5f87 SHA512 5d02990746d167e6f835119c32aecfa9a40fbf03fce803a2d32e8aa9ba34bed579b9804d8abfe54b2b996389a4920dbb724e8da19cbde32af56fff3659c88d25 diff --git a/dev-libs/kpublictransport/kpublictransport-22.04.2.ebuild b/dev-libs/kpublictransport/kpublictransport-22.04.3.ebuild similarity index 98% rename from dev-libs/kpublictransport/kpublictransport-22.04.2.ebuild rename to dev-libs/kpublictransport/kpublictransport-22.04.3.ebuild index e9e30e4aac99..794a4be96b8b 100644 --- a/dev-libs/kpublictransport/kpublictransport-22.04.2.ebuild +++ b/dev-libs/kpublictransport/kpublictransport-22.04.3.ebuild @@ -7,7 +7,7 @@ ECM_QTHELP="true" ECM_TEST="true" KDE_GEAR="true" KFMIN=5.92.0 -QTMIN=5.15.3 +QTMIN=5.15.4 inherit ecm kde.org DESCRIPTION="Library for accessing public transport timetables and other information" diff --git a/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild b/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild index 07df25070ff2..950195bd63b0 100644 --- a/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild +++ b/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://ubuntu/pool/main/liba/${PN}/${PN}_${MY_PV}+20.10.${PATCH_VERSI LICENSE="LGPL-2.1 LGPL-3" SLOT="3" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86" IUSE="+introspection test" RDEPEND=" diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest index 861e714d7c22..86e7f6ff33e3 100644 --- a/dev-libs/libical/Manifest +++ b/dev-libs/libical/Manifest @@ -1,2 +1 @@ -DIST libical-3.0.12.tar.gz 883537 BLAKE2B a67cbf767f5dba7717c80b2ed90f257025544b6fbbd85e4d10712fb63ec5d750c00e9a1d664b0c75f7e833847aeee2fc1412866bf4b599ead663132b3665835f SHA512 e97aec11895d4c51fcb1fe32598f5fc23bbffc26274d1f46e74d1b9a365bea65446563224b852d13a763334eab0375e77cabb5ba535d3b2f89b652bbe24b4517 DIST libical-3.0.14.tar.gz 887795 BLAKE2B 8c073b77b5e4e6b24e3dfae7ac7a5f88da874bdfa53489cd04afd4d458d2fc963d39c2816691e777003ca9af510ceaf7bab9d7e1021942aa9c3adaad32ca8341 SHA512 36da5516672976c71b049a12af36164d91f9b655f81f1884766558149f25e80c30e64d15da848842f8a629295d708f39ce6fa63a3b0da39b5cbeb91911a4e6d8 diff --git a/dev-libs/libical/libical-3.0.12.ebuild b/dev-libs/libical/libical-3.0.12.ebuild deleted file mode 100644 index a48681327fb0..000000000000 --- a/dev-libs/libical/libical-3.0.12.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -VALA_USE_DEPEND="vapigen" -inherit cmake python-any-r1 vala - -DESCRIPTION="Implementation of basic iCAL protocols" -HOMEPAGE="https://github.com/libical/libical" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="|| ( MPL-2.0 LGPL-2.1 )" -SLOT="0/3" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" -IUSE="berkdb doc examples +glib +introspection static-libs test vala" - -REQUIRED_USE="introspection? ( glib ) vala? ( introspection )" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-libs/icu:= - berkdb? ( sys-libs/db:= ) - glib? ( dev-libs/glib:2 ) -" -DEPEND="${COMMON_DEPEND} - glib? ( dev-libs/libxml2:2 ) -" -RDEPEND="${COMMON_DEPEND} - sys-libs/timezone-data -" -BDEPEND=" - dev-lang/perl - virtual/pkgconfig - doc? ( - app-doc/doxygen[dot] - glib? ( dev-util/gtk-doc ) - ) - introspection? ( dev-libs/gobject-introspection ) - test? ( - ${PYTHON_DEPS} - glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') ) - ) - vala? ( $(vala_depend) ) -" - -DOCS=( - AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO - doc/{AddingOrModifyingComponents.txt,UsingLibical.md} -) - -PATCHES=( - "${FILESDIR}/${PN}-3.0.4-tests.patch" - "${FILESDIR}/${PN}-3.0.11-pkgconfig-libdir.patch" -) - -python_check_deps() { - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - use examples || cmake_comment_add_subdirectory examples - use vala && vala_src_prepare -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package berkdb BDB) - -DICAL_BUILD_DOCS=$(usex doc) - -DICAL_GLIB=$(usex glib) - -DGOBJECT_INTROSPECTION=$(usex introspection) - -DSHARED_ONLY=$(usex !static-libs) - -DLIBICAL_BUILD_TESTING=$(usex test) - -DICAL_GLIB_VAPI=$(usex vala) - ) - if use vala; then - mycmakeargs+=( - -DVALAC="${VALAC}" - -DVAPIGEN="${VAPIGEN}" - ) - fi - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use doc && cmake_src_compile docs -} - -src_test() { - local myctestargs=( - -E "(icalrecurtest|icalrecurtest-r)" # bug 660282 - ) - - cmake_src_test -} - -src_install() { - use doc && local HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. ) - - cmake_src_install - - if use examples; then - rm examples/CMakeLists.txt || die - dodoc -r examples - fi -} diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild index d17799864421..90d84a4c8a65 100644 --- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild +++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz" LICENSE="GPL-3" SLOT="3" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libzia/libzia-4.36.ebuild b/dev-libs/libzia/libzia-4.36.ebuild index 25c5469993ee..7d83b69f0dae 100644 --- a/dev-libs/libzia/libzia-4.36.ebuild +++ b/dev-libs/libzia/libzia-4.36.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="ftdi" RDEPEND="dev-libs/glib:2 diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 2e68b36d9edb..73d3a2adfe6b 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,3 +1,2 @@ DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e -DIST libzip-1.9.0.tar.xz 763704 BLAKE2B 204952e96ddcff0d799cd7f4ce4be868aad6f6555999673eba9bd85382ab26546f6423034fa68461009d095d4a2513b490b2b144aca0caa8c0be0980b35ba124 SHA512 dd0c7046f5b1faf00690774572982e870edaa1819563f9ebf7caf823c9c5718623576a7135a64c9acfed9cefac5601cf944b7aa0b623986f5c85743f3014b349 DIST libzip-1.9.2.tar.xz 763980 BLAKE2B ceeca4dccbe7552f7f545b00ea44b342398d18eb996e39045b9d6efafe50f8890333ddf220c86b59f5ab2849420eb76761c42b16de8b174629f53e327f9e83e7 SHA512 82cb2533c25b5b540aa73856c958750d32eeceb192cce257eded15b396a24652041c8531f20366ac4c2dc6b7c0310c558d19c12b611576eccb07cfbaf98120b5 diff --git a/dev-libs/libzip/libzip-1.9.0.ebuild b/dev-libs/libzip/libzip-1.9.0.ebuild deleted file mode 100644 index 0a706c57e930..000000000000 --- a/dev-libs/libzip/libzip-1.9.0.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake multibuild flag-o-matic - -DESCRIPTION="Library for manipulating zip archives" -HOMEPAGE="https://nih.at/libzip/" -SRC_URI="https://www.nih.at/libzip/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0/5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd" -REQUIRED_USE="test? ( tools )" - -RESTRICT="!test? ( test )" - -DEPEND=" - sys-libs/zlib - bzip2? ( app-arch/bzip2:= ) - lzma? ( app-arch/xz-utils ) - ssl? ( - gnutls? ( - dev-libs/nettle:0= - >=net-libs/gnutls-3.6.5:= - ) - !gnutls? ( - mbedtls? ( net-libs/mbedtls:= ) - !mbedtls? ( dev-libs/openssl:0= ) - ) - ) - zstd? ( app-arch/zstd ) -" -RDEPEND="${DEPEND}" - -pkg_setup() { - # Upstream doesn't support building dynamic & static - # simultaneously: https://github.com/nih-at/libzip/issues/76 - MULTIBUILD_VARIANTS=( shared $(usev static-libs) ) -} - -src_configure() { - append-lfs-flags - myconfigure() { - local mycmakeargs=( - -DBUILD_EXAMPLES=OFF # nothing is installed - -DENABLE_COMMONCRYPTO=OFF # not in tree - -DENABLE_BZIP2=$(usex bzip2) - -DENABLE_LZMA=$(usex lzma) - -DENABLE_ZSTD=$(usex zstd) - ) - if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then - mycmakeargs+=( - -DBUILD_DOC=OFF - -DBUILD_EXAMPLES=OFF - -DBUILD_SHARED_LIBS=OFF - -DBUILD_TOOLS=OFF - ) - else - mycmakeargs+=( - -DBUILD_DOC=ON - -DBUILD_REGRESS=$(usex test) - -DBUILD_TOOLS=$(usex tools) - ) - fi - - if use ssl; then - if use gnutls; then - mycmakeargs+=( - -DENABLE_GNUTLS=$(usex gnutls) - -DENABLE_MBEDTLS=OFF - -DENABLE_OPENSSL=OFF - ) - elif use mbedtls; then - mycmakeargs+=( - -DENABLE_GNUTLS=OFF - -DENABLE_MBEDTLS=$(usex mbedtls) - -DENABLE_OPENSSL=OFF - ) - else - mycmakeargs+=( - -DENABLE_GNUTLS=OFF - -DENABLE_MBEDTLS=OFF - -DENABLE_OPENSSL=ON - ) - fi - else - mycmakeargs+=( - -DENABLE_GNUTLS=OFF - -DENABLE_MBEDTLS=OFF - -DENABLE_OPENSSL=OFF - ) - fi - cmake_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake_src_compile -} - -src_test() { - run_tests() { - [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test - } - - multibuild_foreach_variant run_tests -} - -src_install() { - multibuild_foreach_variant cmake_src_install -} diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest index d08915a62ed0..edd5f1bcbca4 100644 --- a/dev-libs/oniguruma/Manifest +++ b/dev-libs/oniguruma/Manifest @@ -1 +1,2 @@ DIST onig-6.9.7.1.tar.gz 935705 BLAKE2B 1042d5b211f53ad8983eb6b4e53beb165bc948bbef9a85ad12578a9237a804e3dcd0a8105914156230ec30e11f2c8a0372c37919cdde7b2be104c66a8b22fb52 SHA512 17711e0d451c41e74cb3f8ab4e78b0181578ef42cb35dc64e87871c82a41909334cb4eeb03eccdccf6904f699e6e82b0dbb54077138225b9b95471fcdeb8c486 +DIST onig-6.9.8.tar.gz 944148 BLAKE2B ee7d91f2d3a7a41d675bcbb9d18490aa3e5a9edb8f3c6e880d27f2218c476499bba21088def41fbb5d500bfb2916af85c2489fca5bd846594fab53ac492531af SHA512 5a3d220961c22cda981bbae06dc383401771362cdf67e4f0b5d2fa8951a03907362edae498f63226287e70715c0abe4acdd22ec3ceb74bbb226234a52c36a4d7 diff --git a/dev-libs/oniguruma/oniguruma-6.9.8.ebuild b/dev-libs/oniguruma/oniguruma-6.9.8.ebuild new file mode 100644 index 000000000000..86e9755fe4c8 --- /dev/null +++ b/dev-libs/oniguruma/oniguruma-6.9.8.ebuild @@ -0,0 +1,55 @@ +# Copyright 2003-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit multilib-minimal + +if [[ "${PV}" == "9999" ]]; then + inherit autotools git-r3 + + EGIT_REPO_URI="https://github.com/kkos/oniguruma" +fi + +DESCRIPTION="Regular expression library for different character encodings" +HOMEPAGE="https://github.com/kkos/oniguruma" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" +else + SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz" +fi + +LICENSE="BSD-2" +SLOT="0/5" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +IUSE="crnl-as-line-terminator static-libs" + +BDEPEND="" +DEPEND="" +RDEPEND="" + +if [[ "${PV}" != "9999" ]]; then + S="${WORKDIR}/onig-${PV}" +fi + +DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES}) + +src_prepare() { + default + + if [[ "${PV}" == "9999" ]]; then + eautoreconf + fi +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + --enable-posix-api \ + $(use_enable crnl-as-line-terminator) \ + $(use_enable static-libs static) +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name "*.la" -delete || die +} diff --git a/dev-libs/oniguruma/oniguruma-9999.ebuild b/dev-libs/oniguruma/oniguruma-9999.ebuild index 405b066a532a..97f1a28922bd 100644 --- a/dev-libs/oniguruma/oniguruma-9999.ebuild +++ b/dev-libs/oniguruma/oniguruma-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 2003-2020 Gentoo Authors +# Copyright 2003-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" inherit multilib-minimal diff --git a/dev-libs/urdfdom/Manifest b/dev-libs/urdfdom/Manifest index 88ece9f4ede7..aae19a5aeca9 100644 --- a/dev-libs/urdfdom/Manifest +++ b/dev-libs/urdfdom/Manifest @@ -1,2 +1,3 @@ DIST urdfdom-1.0.4.tar.gz 276958 BLAKE2B 19353c38d8fa8f1d6d752302bc8b7b84b13cc6c6f83af31dba677184fa09fd42d7de0c00e6927f085c3d013d2bde664dd7ea69d3c69de4c14130c08d256e6f87 SHA512 2a7a0ec61445132b3e8f6ba8b2268b9fd7c035a72b3e4d61b5ed665d07e902a02b87d2c60c53fc9b0c385a871cd8d87f278bd4833f1f904635ec46755a544003 DIST urdfdom-3.0.1.tar.gz 285714 BLAKE2B 1f27225dce2e715b421ad8290326f879c3c564146bb097f46d9602ab22a41d4f669df8a271db2eb700f23e75e6e1ffd98bfc06bf82b79fe0bc8ceda87e46f49c SHA512 f632aa3095f2ee27328ca1eaae2e10d1e69f540d1ae0a97337162ee57af0ba9be08c0a7456eb86cf949f849d1e4b727f0a8890ce9b5ee2e7fdac92b3aa0c4120 +DIST urdfdom-3.1.0.tar.gz 286589 BLAKE2B cfe0ba0160091c4160f4ad7d6648657cc19fcaea4346e89d4a8e685c67bbf038b4a23c0133f8af987d4aee7dac623d10c61eb98573e9a0ebf57babd7d6d48b7d SHA512 2ca34982550f0d83504ec711f45c59fa9011802ad85ffc8511fb02b7421ee99daad3f00d82925cd3490dd0164dfe7881c0d52c05fbea2be0449e57e565034695 diff --git a/dev-libs/urdfdom/urdfdom-3.1.0.ebuild b/dev-libs/urdfdom/urdfdom-3.1.0.ebuild new file mode 100644 index 000000000000..e21e9883c072 --- /dev/null +++ b/dev-libs/urdfdom/urdfdom-3.1.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/ros/urdfdom" +fi + +inherit ${SCM} cmake + +if [ "${PV#9999}" != "${PV}" ] ; then + SRC_URI="" +else + KEYWORDS="~amd64 ~arm" + SRC_URI="https://github.com/ros/urdfdom/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +DESCRIPTION="URDF (U-Robot Description Format) library" +HOMEPAGE="http://ros.org/wiki/urdf" +LICENSE="BSD" +SLOT="0/3" +IUSE="" + +RDEPEND=">=dev-libs/urdfdom_headers-1.0.0 + >=dev-libs/console_bridge-0.3:= + dev-libs/tinyxml[stl]" +DEPEND="${RDEPEND}" diff --git a/dev-libs/urdfdom_headers/Manifest b/dev-libs/urdfdom_headers/Manifest index ba09da9739b8..b117b1603fd7 100644 --- a/dev-libs/urdfdom_headers/Manifest +++ b/dev-libs/urdfdom_headers/Manifest @@ -1 +1 @@ -DIST urdfdom_headers-1.0.5.tar.gz 12639 BLAKE2B fdd3fd0eb26027a920bfd89432ff2f50d8c8377630ff8e385b9691da46cf40a454f5e0651aa5d107ef9e96499ba6439b14aeb346b94b4c33fde699d09097a927 SHA512 c16d83282c189d7720326ed0628c4b3359a859f45157e08f78ffa10a5607d01e6f64b2caa3b721ab9fcf2d83ee1240bc6f43ab484946e7a381122b27bd057b58 +DIST urdfdom_headers-1.1.0.tar.gz 12676 BLAKE2B 1c2dbc5d3b63a493abdf1c6e5d41ed51e101332c67d5aad61f073dfe1881ade7be8345a6fea5816ebbf100804d8b13ca1d6a195a54caa1ef093fde49929cb34d SHA512 beae18cd21ad58c7f267075de1242a08579a1667853cc42c3c744484927035bb0095c66751eda4e1baa3ac0103dce4b8c94ef25d83defb42077c1de9342f769a diff --git a/dev-libs/urdfdom_headers/urdfdom_headers-1.0.5.ebuild b/dev-libs/urdfdom_headers/urdfdom_headers-1.1.0.ebuild similarity index 93% rename from dev-libs/urdfdom_headers/urdfdom_headers-1.0.5.ebuild rename to dev-libs/urdfdom_headers/urdfdom_headers-1.1.0.ebuild index 6530d6794eaa..c18de1f310ff 100644 --- a/dev-libs/urdfdom_headers/urdfdom_headers-1.0.5.ebuild +++ b/dev-libs/urdfdom_headers/urdfdom_headers-1.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index 71c8f2d98ac8..2ba55fafab6a 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest index ae7a56d67155..005196d5adea 100644 --- a/dev-python/ansi2html/Manifest +++ b/dev-python/ansi2html/Manifest @@ -1 +1,2 @@ DIST ansi2html-1.7.0.tar.gz 42189 BLAKE2B 91c7409b4f8b7503e719489b18e9d7267d80c5259b7481f127cb8d1e6429649249b0832746285efc3e8a4f90ca8f21b872b002634d47a4a54ddfdcc74df0f576 SHA512 bcae0de9874899bd8440853b8279f3b2c4ed46e24bf807221ddc9d1bfa39647e2efd178aefc2fd39bad27b53890270b6ff7c150a0b8e74581b8323ef7a16c977 +DIST ansi2html-1.8.0.tar.gz 44146 BLAKE2B 66672927a64ad38dce0b0819fabc3778f6aba82d176e992630a8db076988a21af8dd445306b8bb580f1539b35044b95de749d6bfb65c27f9b431e4cb6bd562c7 SHA512 cbdda41f206ced5b19761a1ff9747acc6cadca3a5a2f58c97c6073db7d517e59fea7601bba28a8e7e105f3c0c9c4d78ca4f242100cbded6c8a9ca2d598de0ab4 diff --git a/dev-python/ansi2html/ansi2html-1.8.0.ebuild b/dev-python/ansi2html/ansi2html-1.8.0.ebuild new file mode 100644 index 000000000000..5ec4a4804d68 --- /dev/null +++ b/dev-python/ansi2html/ansi2html-1.8.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) + +inherit distutils-r1 + +DESCRIPTION="Convert text with ANSI color codes to HTML" +HOMEPAGE="https://pypi.org/project/ansi2html/ + https://github.com/pycontribs/ansi2html" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="LGPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~riscv ~x86" +IUSE="doc" + +RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]" +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}] + doc? ( + app-text/asciidoc + ) +" + +distutils_enable_tests pytest + +python_install_all() { + use doc && doman man/${PN}.1 + distutils-r1_python_install_all +} + +src_compile() { + # Upstream https://github.com/pycontribs/ansi2html/issues/124 + use doc && emake _MANUAL_VERSION="${PV}" man/ansi2html.1 + distutils-r1_src_compile +} diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest index 66100bd43946..795bd9a0fafb 100644 --- a/dev-python/boto3/Manifest +++ b/dev-python/boto3/Manifest @@ -4,3 +4,4 @@ DIST boto3-1.24.20.gh.tar.gz 512415 BLAKE2B c2196a9a518b0e4c0fb6e2382390d7d8e275 DIST boto3-1.24.21.gh.tar.gz 513083 BLAKE2B 1de0405823b6b33efcb11316a3c400180fa3f9064a63023e2f13d6ae18fb6e60ac229ba11c8eb93901d4a6ca65aa32e9ff576b421ffbb6e75476149e93df4d2e SHA512 4f278cbe0bffd2107354aaa76ef7e725a8ea3fcf1688614203204b495be596405fcb0add790922ab09858d94798bc06076c9160f42ff20b855b8a31859c57bc4 DIST boto3-1.24.22.gh.tar.gz 513301 BLAKE2B 1b71d128cc8f8224fd1ef521988e6b5e941562c256c2769941340f6a9e3342394f9e2cf20d658bc4b0e9f5ddaebc832ae8fdc96e35e348b73631ca01f0be33a6 SHA512 eb64a050c1b63da823fad2b10db828fefbf75a95ae1f222576eabb8efa80cbbb3e54862dfd40813a8d58f9c329f4d95595bbebc172bcf0141c241499af7d4726 DIST boto3-1.24.23.gh.tar.gz 514077 BLAKE2B ff5b661d477e8163e83cb85045b61fa8057f9cab0b93b2d4575904b17361801e3ffc928ee86624bdf61213a0dc93be91f101e30f418869a1c5dd65e16ff9ed2a SHA512 c127f11e7cd42d0c7f2b802de425d087722ae81fc642fd6867d44cf1b1686ca94b3de76b3034abbd9b85393f8f59d18ea46cd68a57804e658d65e9fba6e6f9a6 +DIST boto3-1.24.24.gh.tar.gz 514350 BLAKE2B 6ddb182ef3fa9018d763747bcc3508bbb37a40576ac80f4fbbd25efaa2a96de411a76a2cfafdea7664926c07f7733245b2a6703d8c2d341e43450e7d7eaa4894 SHA512 2465c33529900a7d67f8cc994a0665879d940967279d33be167dcf2eed078575ddea099a40978b291c7a941e8276f3938bd52a002634e73fe64272d8843e47d2 diff --git a/dev-python/boto3/boto3-1.24.24.ebuild b/dev-python/boto3/boto3-1.24.24.ebuild new file mode 100644 index 000000000000..6edcc751d54b --- /dev/null +++ b/dev-python/boto3/boto3-1.24.24.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) + +inherit distutils-r1 multiprocessing + +DESCRIPTION="The AWS SDK for Python" +HOMEPAGE=" + https://github.com/boto/boto3/ + https://pypi.org/project/boto3/ +" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/boto3" + inherit git-r3 + BOTOCORE_PV=${PV} +else + SRC_URI=" + https://github.com/boto/boto3/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz + " + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" + + # botocore is x.(y+3).z + BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)" +fi + +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +distutils_enable_sphinx docs/source \ + 'dev-python/guzzle_sphinx_theme' +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() { + epytest tests/{functional,unit} -n "$(makeopts_jobs)" +} diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest index 0cbe815897be..901170c8f5e9 100644 --- a/dev-python/botocore/Manifest +++ b/dev-python/botocore/Manifest @@ -4,3 +4,4 @@ DIST botocore-1.27.20.tar.gz 9146126 BLAKE2B 3ec9e6480fb5bc95f72ffa1f0972b7d9e80 DIST botocore-1.27.21.tar.gz 9149425 BLAKE2B fa7141f78128ebc4810bf51bcca93a23606ef611721fd1a32ca490a9e38aef86439385bd7a0465e82a853c5bb7596dffb0b17fc5d7015fb5039f4933ab1554f1 SHA512 59bdf83b237e3845f48685919a6330846d2a4d7ce12d15d99cdb8dd9f2d3e0dcc0d1641c52de8d6d9ef7b7202b80bc59070cb1786f1b38c20884e0fa32481432 DIST botocore-1.27.22.tar.gz 9151155 BLAKE2B e3aa6e9814e07bca2bd67d16f6548303af71654021b28f13c43b4005ba24a32cfccffa9a145babb781a6cbff9df3eab7de4c18973c00b3861ba83264eb144537 SHA512 57e43577840c62556760ff40d820898b0ee1efeb5da39fbdfe8c7ef53e86c8184bdfed5a52eeb9d0652fa053900462bdad9820b4a34bd4b5231f361b89c710d6 DIST botocore-1.27.23.tar.gz 9161058 BLAKE2B c4e70d4662b45b1365eb3db3f9aa39ef989bb95d962c4b31fecf16b2bc5b14db46cb5aedc7abe23e2fd6484544efa2a894141c1245c842d9c05a89cb560ad0a2 SHA512 80c70c50d5a8fa5f9bdfa5cf0762edd83c8503bf1a65db1b8680e0d9ed8356699ee23ed4db0ab60e34b69cdc5ddc12ff69f2cf3907cf8f8d5075d26a3ba4373f +DIST botocore-1.27.24.tar.gz 9164664 BLAKE2B 3a1453e01dec7b526ac613f5a0b98151e8cc60d524e0dc11d1b1ab82ebd16bdd134190618a4469d44a14a18fe26027a51f04b351e35399ba8f1d81f82ab9a780 SHA512 5778d031e11cf3e441b844c530c0685c1a4fdb5a55f8a45b77c62028cb49852eea4f1dab09af2016a5cfcbab7dcf83cee3143f517034b03d1379be2b85e64585 diff --git a/dev-python/botocore/botocore-1.27.24.ebuild b/dev-python/botocore/botocore-1.27.24.ebuild new file mode 100644 index 000000000000..830c713f6036 --- /dev/null +++ b/dev-python/botocore/botocore-1.27.24.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) + +inherit distutils-r1 multiprocessing + +DESCRIPTION="Low-level, data-driven core of boto 3" +HOMEPAGE=" + https://github.com/boto/botocore/ + https://pypi.org/project/botocore/ +" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/botocore" + inherit git-r3 +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +RDEPEND=" + dev-python/six[${PYTHON_USEDEP}] + =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/jsonschema[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +distutils_enable_sphinx docs/source \ + 'dev-python/guzzle_sphinx_theme' +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 + ) + + epytest tests/{functional,unit} -n "$(makeopts_jobs)" +} diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest index c7f66fef7438..ad5ec33456df 100644 --- a/dev-python/catkin_pkg/Manifest +++ b/dev-python/catkin_pkg/Manifest @@ -1 +1,2 @@ DIST catkin_pkg-0.4.24-gh.tar.gz 65113 BLAKE2B 554848e5e34a663b29246ec1109f228361cbb010d76d54e0b27107189382843e90babf24f8660dce4063324f78dff87286e31f5f1bb7db10aaa86e056c23de2d SHA512 7c746917876d5a9d8be6f187fc3d75e322ab158ff9fd1b9c661e0802504b188c59d47ad42320613e3aff26b83a6f239bb3dec5d0ab16dadd2ff1e26f73288e61 +DIST catkin_pkg-0.5.2-gh.tar.gz 67596 BLAKE2B aec34c6f54926dee02034d542741affe9cb662b06b354062088bec1fec25381f036d59af5fa52153ba1ce1c91fdf8bb9d1484475df8a63268ca474a7acd5f285 SHA512 40e7e3839017ad430ee36dccf87a90727e5efd92e6c605cdba3e9f8850b71a6a80da79bd8760d94e356dadebdd842c8a3f8b530782fb75503d3e620add79be4a diff --git a/dev-python/catkin_pkg/catkin_pkg-0.5.2.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.5.2.ebuild new file mode 100644 index 000000000000..ae7ac37cda94 --- /dev/null +++ b/dev-python/catkin_pkg/catkin_pkg-0.5.2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg" +fi + +inherit ${SCM} distutils-r1 + +DESCRIPTION="Standalone Python library for the catkin package system" +HOMEPAGE="https://wiki.ros.org/catkin_pkg" +if [ "${PV#9999}" != "${PV}" ] ; then + SRC_URI="" +else + SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz" + KEYWORDS="~amd64 ~arm" +fi + +LICENSE="BSD" +SLOT="0" + +RDEPEND=" + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/pyparsing[${PYTHON_USEDEP}] + !