diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-26 14:37:04 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-26 14:37:04 +0000 |
| commit | 698f6577bb03deb82863e5ff21af49836790eeb2 (patch) | |
| tree | 27ea437a1785f1020f6f3cabb7c34a60689c753c | |
| parent | 2021-02-26 14:22:10 UTC (diff) | |
| parent | dev-python/python-gflags: Port to python 3.9 (diff) | |
| download | gentoo-698f6577bb03deb82863e5ff21af49836790eeb2.tar.gz gentoo-698f6577bb03deb82863e5ff21af49836790eeb2.tar.bz2 gentoo-698f6577bb03deb82863e5ff21af49836790eeb2.zip | |
Merge updates from master
77 files changed, 615 insertions, 1648 deletions
diff --git a/acct-group/err/err-0.ebuild b/acct-group/err/err-0.ebuild new file mode 100644 index 000000000000..c1dcd9ca10c8 --- /dev/null +++ b/acct-group/err/err-0.ebuild @@ -0,0 +1,8 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-group + +ACCT_GROUP_ID=325 diff --git a/acct-group/err/metadata.xml b/acct-group/err/metadata.xml new file mode 100644 index 000000000000..7a38bb900964 --- /dev/null +++ b/acct-group/err/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> +</pkgmetadata> diff --git a/acct-user/err/err-0.ebuild b/acct-user/err/err-0.ebuild new file mode 100644 index 000000000000..1663b0acc907 --- /dev/null +++ b/acct-user/err/err-0.ebuild @@ -0,0 +1,11 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-user + +ACCT_USER_ID=325 +ACCT_USER_GROUPS=( "${PN}" ) + +acct-user_add_deps diff --git a/acct-user/err/metadata.xml b/acct-user/err/metadata.xml new file mode 100644 index 000000000000..7a38bb900964 --- /dev/null +++ b/acct-user/err/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> +</pkgmetadata> diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest index eddd28d3cda3..55b0c06e279f 100644 --- a/app-admin/ansible-lint/Manifest +++ b/app-admin/ansible-lint/Manifest @@ -1,2 +1,3 @@ DIST ansible-lint-4.0.1.tar.gz 2909257 BLAKE2B c030b6fc58eaeeec42e40dd5bc46e5181916433b905bfc4a82382bf6bba8536d2639172aab0e2928ce1dd5489f322e19ab1c0ea5abb637562616addb9733e81a SHA512 a2f3bd44287a2c72f79c5fbb4c02446484cf764d386d403694325bce172e2b195dd4812e0f89e5f4e1930db124e2b383e4f067bed5d4858c354c0ae0b3fb03e4 DIST ansible-lint-4.1.0.tar.gz 2911091 BLAKE2B b6e414dbdeebcc1cae900736829abf2db0930e5e05ae7c2bbd6d30a89b6ac28485ddfb63528bdc3baae6ef97ae7536507632d43b16f9a16dd86887d781940aeb SHA512 c1d07093d68bf5f43c20c3a999adf26d23ba587d5008a35069dcbab514b208737f5d0ecaf032e43d313233ea06193db81b349d5fb62f3ac684af9e51d8bc6e08 +DIST ansible-lint-5.0.2.tar.gz 331359 BLAKE2B e86a1bce18d3a04fa4d895e9f8650f6853d706588bcfa564ee8245a63a6779cc00737351807d0bc3fdd624c348275afda15d3834faa2efd01b2383115864f7a6 SHA512 760da7574db68d351a4a834d7963840ebe61c72df62db220f2c3e894f0906a193783821823621f64eb7d2f16f6f226f748ff03f068beb14fa43ca009ab0df539 diff --git a/app-admin/ansible-lint/ansible-lint-5.0.2.ebuild b/app-admin/ansible-lint/ansible-lint-5.0.2.ebuild new file mode 100644 index 000000000000..1669284dd5aa --- /dev/null +++ b/app-admin/ansible-lint/ansible-lint-5.0.2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 + +DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved" +HOMEPAGE="https://github.com/ansible-community/ansible-lint" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +# tests are broken at the moment +RESTRICT="test" + +RDEPEND=" + app-admin/ansible[${PYTHON_USEDEP}] + dev-python/enrich[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/wcmatch[${PYTHON_USEDEP}]" +BDEPEND=" + dev-python/ruamel-yaml[${PYTHON_USEDEP}] + dev-python/setuptools_scm[${PYTHON_USEDEP}] + dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}] + test? ( + dev-python/flake8[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + )" + +distutils_enable_tests nose diff --git a/app-misc/gcalcli/gcalcli-4.2.0.ebuild b/app-misc/gcalcli/gcalcli-4.2.0.ebuild index 4d9494ca6015..f1c13585884a 100644 --- a/app-misc/gcalcli/gcalcli-4.2.0.ebuild +++ b/app-misc/gcalcli/gcalcli-4.2.0.ebuild @@ -1,33 +1,30 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -# parsedatetime doesn't support pypy -PYTHON_COMPAT=( python3_7 ) +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 MY_PV="4.2.0" - DESCRIPTION="Google Calendar Command Line Interface" HOMEPAGE="https://github.com/insanum/gcalcli" SRC_URI="https://github.com/insanum/gcalcli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/gcalcli-${MY_PV}" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="${PYTHON_DEPS} +RDEPEND=" >=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}] dev-python/parsedatetime[${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/python-gflags[${PYTHON_USEDEP}] dev-python/vobject[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" -S="${WORKDIR}/gcalcli-${MY_PV}" +distutils_enable_tests pytest src_install() { dodoc -r ChangeLog README.md docs diff --git a/app-misc/gcalcli/metadata.xml b/app-misc/gcalcli/metadata.xml index abed7bc8eb66..3a9f4364293c 100644 --- a/app-misc/gcalcli/metadata.xml +++ b/app-misc/gcalcli/metadata.xml @@ -5,7 +5,9 @@ <email>robbat2@gentoo.org</email> <name>Robin H. Johnson</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">insanum/gcalcli</remote-id> + <remote-id type="pypi">gcalcli</remote-id> </upstream> </pkgmetadata> diff --git a/app-misc/goobook/Manifest b/app-misc/goobook/Manifest index 77ff4c3178c0..1ce6d6f2f81a 100644 --- a/app-misc/goobook/Manifest +++ b/app-misc/goobook/Manifest @@ -1 +1,2 @@ DIST goobook-3.4.tar.gz 35100 BLAKE2B 8419f79313a68b108f08a0f7a0b6809d01979a01044d011f53acdf554e87f20f3ac41819a4823abd74e1c8ce0350956e91f17ae9a9342551a263af72b7b6c98a SHA512 e58cdee28ee4464548b04800740d0ffd40ce972efd52af9509f3de603eed9e50fad03cc9116f1d0dc42f77621bbab58d73bff98cf35a3cb55b24a0f04b26cd4d +DIST goobook-3.5.1.tar.gz 38176 BLAKE2B 99a068256ca83e800a2d2e82c88adba85797107dc72edde9fbb3c9790ef38fff627b4db64c21baff14aa8a4c69788c29aeb01dae60533c7f389352aee9401e9c SHA512 58d056d7d76843bc874e55424912bb00068541e674b780511b7753da31f2df9514baa188017dd0a7479b5527cd50c47e35f37afc493bdc973e0eb1624998a611 diff --git a/app-misc/goobook/goobook-3.5.1.ebuild b/app-misc/goobook/goobook-3.5.1.ebuild new file mode 100644 index 000000000000..be5d2164e594 --- /dev/null +++ b/app-misc/goobook/goobook-3.5.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 readme.gentoo-r1 + +DESCRIPTION="Access your Google contacts from the command line" +HOMEPAGE="https://gitlab.com/goobook/goobook" +SRC_URI="mirror://pypi/g/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=dev-python/google-api-python-client-1.7.12[${PYTHON_USEDEP}] + >=dev-python/simplejson-3.16.0[${PYTHON_USEDEP}] + >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] + <dev-python/oauth2client-5[${PYTHON_USEDEP}]" + +DISABLE_AUTOFORMATTING=1 +DOC_CONTENTS=" +To setup initial authentication, execute: + +~ $ goobook authenticate + +If you want to use goobook from mutt, add this in your .muttrc file: + set query_command=\"goobook query '%s'\" +to query address book. + +You may find more information and advanced configuration tips at +https://pypi.org/project/${PN}/${PV} in \"Configure/Mutt\" section" + +src_install() { + distutils-r1_src_install + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/app-misc/goobook/metadata.xml b/app-misc/goobook/metadata.xml index 7502096e1290..da36391e86c0 100644 --- a/app-misc/goobook/metadata.xml +++ b/app-misc/goobook/metadata.xml @@ -9,6 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="pypi">goobook</remote-id> </upstream> diff --git a/dev-db/pgcli/metadata.xml b/dev-db/pgcli/metadata.xml index 5e8bd61f502f..22ae05489b8d 100644 --- a/dev-db/pgcli/metadata.xml +++ b/dev-db/pgcli/metadata.xml @@ -9,6 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">dbcli/pgcli</remote-id> </upstream> diff --git a/dev-python/ansi/Manifest b/dev-python/ansi/Manifest index 04b85493348e..dba5288bc241 100644 --- a/dev-python/ansi/Manifest +++ b/dev-python/ansi/Manifest @@ -1 +1 @@ -DIST ansi-0.1.5.tar.gz 4606 BLAKE2B 5f88319f05262511e99c8385946b61e2ed7219217ae8e811e8c1762fbd402f2fcaf69bcd6e4caf35d1f982afebcce5a98c721e2598032891382010ff7b928c55 SHA512 03365aca71b4966ca0c78b1563400afe414c86288b4e8ede969fb9c79cd4da4722de8cedae4e86c2f536f82eda42845482e041a396cb33852d3e4ff639dbbb64 +DIST ansi-0.2.0.tar.gz 5173 BLAKE2B 436caa8e1f36e96f1844e79e3a0ff0c4099e76b25ce9f56c9d8663aeeb650f32fba75a14fe8548f557fb020e2340707272fdda4cdd3c245c903a4f801ae48413 SHA512 22c69b5030f03eca9470e288c16e62042ccd02ef2e232600a4fab629354601d5da0f7c16b60dae7293c69255e5d4125298890d99dba8e5387960a5be60b92d61 diff --git a/dev-python/ansi/ansi-0.1.5.ebuild b/dev-python/ansi/ansi-0.2.0.ebuild index d6cec8f9c3d1..afc8d0584e2f 100644 --- a/dev-python/ansi/ansi-0.1.5.ebuild +++ b/dev-python/ansi/ansi-0.2.0.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{3_7,3_8} ) - +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 DESCRIPTION="ANSI cursor movement and graphics in Python" HOMEPAGE="https://github.com/tehmaze/ansi" SRC_URI="https://github.com/tehmaze/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${PN}-${P}" +distutils_enable_tests pytest diff --git a/dev-python/ansi/metadata.xml b/dev-python/ansi/metadata.xml index 7a7fc220ebbe..c404dbdf8174 100644 --- a/dev-python/ansi/metadata.xml +++ b/dev-python/ansi/metadata.xml @@ -5,6 +5,7 @@ <email>pinkbyte@gentoo.org</email> <name>Sergey Popov</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">tehmaze/ansi</remote-id> <remote-id type="pypi">ansi</remote-id> diff --git a/dev-python/bluelet/metadata.xml b/dev-python/bluelet/metadata.xml index f536dab566d1..1bc472c3baa3 100644 --- a/dev-python/bluelet/metadata.xml +++ b/dev-python/bluelet/metadata.xml @@ -9,6 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <stabilize-allarches/> <longdescription lang="en"> Bluelet is a simple, pure-Python solution for writing intelligible asynchronous socket applications. It uses PEP 342 coroutines to make concurrent I/O look and act like sequential programming. diff --git a/dev-python/cleo/metadata.xml b/dev-python/cleo/metadata.xml index 9276c356eb74..c57752eb0781 100644 --- a/dev-python/cleo/metadata.xml +++ b/dev-python/cleo/metadata.xml @@ -9,6 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">sdispater/cleo</remote-id> <remote-id type="pypi">cleo</remote-id> diff --git a/dev-python/clikit/metadata.xml b/dev-python/clikit/metadata.xml index 4a11e6ef158b..7bbe5b12b85a 100644 --- a/dev-python/clikit/metadata.xml +++ b/dev-python/clikit/metadata.xml @@ -9,6 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">sdispater/clikit</remote-id> <remote-id type="github">clikit</remote-id> diff --git a/dev-python/crashtest/metadata.xml b/dev-python/crashtest/metadata.xml index 6af88537ea4d..b3c1cecc09e6 100644 --- a/dev-python/crashtest/metadata.xml +++ b/dev-python/crashtest/metadata.xml @@ -9,6 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">sdispater/crashtest</remote-id> <remote-id type="pypi">crashtest</remote-id> diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest new file mode 100644 index 000000000000..2a50239627c8 --- /dev/null +++ b/dev-python/deepmerge/Manifest @@ -0,0 +1 @@ +DIST deepmerge-0.1.1.tar.gz 5432 BLAKE2B 18f54fa4f0504c1825300373665c99ef1f0ea8f779b00f89cfe8ad44861cb4991cf5694c08788ac1ad3b52686734967dbb954553ba84741a71a70e24c98e6b18 SHA512 209ff3ca6be02d788f9740b6241e2ae0366592051933438e887cac5f89f86201bb870336e94d1bacff709dd63c7644161b33ed1da29da1b823b37987813862c0 diff --git a/dev-python/deepmerge/deepmerge-0.1.1.ebuild b/dev-python/deepmerge/deepmerge-0.1.1.ebuild new file mode 100644 index 000000000000..721eb6b566e2 --- /dev/null +++ b/dev-python/deepmerge/deepmerge-0.1.1.ebuild @@ -0,0 +1,23 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +inherit distutils-r1 + +DESCRIPTION="Tools to handle merging of nested data structures in python" +HOMEPAGE="https://deepmerge.readthedocs.io/en/latest" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +# pypi doesn't ship tests, and last github release is 0.0.5 +RESTRICT="test" + +python_prepare_all() { + sed -i -e '/vcver/d' setup.py || die + distutils-r1_python_prepare_all +} diff --git a/dev-python/deepmerge/metadata.xml b/dev-python/deepmerge/metadata.xml new file mode 100644 index 000000000000..4c200a4ba240 --- /dev/null +++ b/dev-python/deepmerge/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> + <stabilize-allarches/> + <upstream> + <remote-id type="pypi">deepmerge</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/enrich/Manifest b/dev-python/enrich/Manifest new file mode 100644 index 000000000000..be6a0664932f --- /dev/null +++ b/dev-python/enrich/Manifest @@ -0,0 +1 @@ +DIST enrich-1.2.6.tar.gz 15581 BLAKE2B 06f104a11b2dc85c1d80a2b14c548aaac40c78795e86b1c6ae733f884fbd7af0776af53d8cdd15c15d6abb91ca89dd7f815823b419fc2b3de322b50e55844dd0 SHA512 07c280d3526538af9d718c6d423be50d67e8285007a6702b7f3d842725a63cb282192c29481cbea6cbe7da886b630e5694776092dc0ffcaac522ccf1e895b5a9 diff --git a/dev-python/enrich/enrich-1.2.6.ebuild b/dev-python/enrich/enrich-1.2.6.ebuild new file mode 100644 index 000000000000..7ebfa478ac05 --- /dev/null +++ b/dev-python/enrich/enrich-1.2.6.ebuild @@ -0,0 +1,21 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=pyproject.toml +inherit distutils-r1 + +DESCRIPTION="Extend rich functionality" +HOMEPAGE="https://github.com/pycontribs/enrich" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-python/rich[${PYTHON_USEDEP}]" +BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest diff --git a/dev-python/enrich/metadata.xml b/dev-python/enrich/metadata.xml new file mode 100644 index 000000000000..f64ef0857b02 --- /dev/null +++ b/dev-python/enrich/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>chainsaw@gentoo.org</email> + <name>Tony Vroon</name> + </maintainer> + <stabilize-allarches/> + <upstream> + <remote-id type="pypi">enrich</remote-id> + <remote-id type="github">pycontribs/enrich</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/httpcore/metadata.xml b/dev-python/httpcore/metadata.xml index 3b3eef0fd95f..c4f9f49cff39 100644 --- a/dev-python/httpcore/metadata.xml +++ b/dev-python/httpcore/metadata.xml @@ -5,6 +5,7 @@ <email>python@gentoo.org</email> <name>Python</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="pypi">httpcore</remote-id> <remote-id type="github">encode/httpcore</remote-id> diff --git a/dev-python/httpx/metadata.xml b/dev-python/httpx/metadata.xml index 8749dfa631bc..f5203f06f339 100644 --- a/dev-python/httpx/metadata.xml +++ b/dev-python/httpx/metadata.xml @@ -5,6 +5,7 @@ <email>python@gentoo.org</email> <name>Python</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="pypi">httpx</remote-id> <remote-id type="github">encode/httpx</remote-id> diff --git a/dev-python/mypy/mypy-0.800.ebuild b/dev-python/mypy/mypy-0.800.ebuild index 4cb57a9cc7f6..5ca0b5a4e942 100644 --- a/dev-python/mypy/mypy-0.800.ebuild +++ b/dev-python/mypy/mypy-0.800.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86" # stubgen collides with this package: https://bugs.gentoo.org/585594 RDEPEND=" diff --git a/dev-python/nbval/Manifest b/dev-python/nbval/Manifest index 76658bda7211..d05642d0a647 100644 --- a/dev-python/nbval/Manifest +++ b/dev-python/nbval/Manifest @@ -1 +1,2 @@ DIST nbval-0.9.1.tar.gz 64476 BLAKE2B 299f6cb9a1e28b80b2e27a74f2b6614e83e5b571b1dc27d0f6829693dd0f6c2b59845543c91487615a8621e21ac2cbc2d34e60e62b7a646914283e23649d8bd9 SHA512 8ab0cb4e09907d99f898b148b635f0818660d04417c1c809beb93680862a5ecab14b606ecc3f90eff85e5f01de7dbf10954f1edf3629a1cf8ddac00556d4d6e7 +DIST nbval-0.9.6.tar.gz 60932 BLAKE2B 77f283279e16e03ec87f250b2012aabd8f580e24b222efcb0b21d9b0dadc381cea3c4a3f96a85df0104da86911de66e6c21bfd3985801fa9c3d8764b2fb26183 SHA512 d4261fc30e197e7350c07504649f0230751b5ed746fe4626b92c5920032dc15abe47ad421c93f4762e93a8b6afcbca440ca006bfd1cdbcba37d131c4e6decaa7 diff --git a/dev-python/nbval/metadata.xml b/dev-python/nbval/metadata.xml index 30a2a59d768b..d4c0c7296529 100644 --- a/dev-python/nbval/metadata.xml +++ b/dev-python/nbval/metadata.xml @@ -5,6 +5,7 @@ <email>sci@gentoo.org</email> <name>Gentoo Science Project</name> </maintainer> + <stabilize-allarches/> <longdescription> The plugin adds functionality to py.test to recognise and collect Jupyter notebooks. The intended purpose of the tests is to determine whether execution of the stored diff --git a/dev-python/nbval/nbval-0.9.6.ebuild b/dev-python/nbval/nbval-0.9.6.ebuild new file mode 100644 index 000000000000..dd0eb843e62f --- /dev/null +++ b/dev-python/nbval/nbval-0.9.6.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +inherit distutils-r1 + +DESCRIPTION="A py.test plugin to validate Jupyter notebooks" +HOMEPAGE="https://github.com/computationalmodelling/nbval" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/ipykernel[${PYTHON_USEDEP}] + dev-python/jupyter_client[${PYTHON_USEDEP}] + dev-python/nbformat[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest + +python_test() { + local deselect=( + --deselect tests/test_ignore.py::test_conf_ignore_stderr + --deselect tests/test_timeouts.py::test_timeouts + ) + + pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}" +} diff --git a/dev-python/pastel/metadata.xml b/dev-python/pastel/metadata.xml index fdbca71a6d7f..3cd8e1fa015e 100644 --- a/dev-python/pastel/metadata.xml +++ b/dev-python/pastel/metadata.xml @@ -9,6 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">sdispater/pastel</remote-id> <remote-id type="pypi">pastel</remote-id> diff --git a/dev-python/pendulum/metadata.xml b/dev-python/pendulum/metadata.xml index 2f00533e580f..2f9cf790dab4 100644 --- a/dev-python/pendulum/metadata.xml +++ b/dev-python/pendulum/metadata.xml @@ -9,6 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">sdispater/pendulum</remote-id> <remote-id type="pypi">pendulum</remote-id> diff --git a/dev-python/pylev/metadata.xml b/dev-python/pylev/metadata.xml index 1023f11f98d0..eabc276bcd67 100644 --- a/dev-python/pylev/metadata.xml +++ b/dev-python/pylev/metadata.xml @@ -9,6 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">toastdriven/pylev</remote-id> <remote-id type="pypi">pylev</remote-id> diff --git a/dev-python/pymssql/Manifest b/dev-python/pymssql/Manifest index c217ab5304a5..1178559ead7a 100644 --- a/dev-python/pymssql/Manifest +++ b/dev-python/pymssql/Manifest @@ -1 +1,2 @@ DIST pymssql-2.1.3.tar.gz 897987 BLAKE2B e105dd8d5dbbad5de566b9179f799ad66eb420f60464e8061470b1abb6ecf38f35ad7992ded40f2cd62c76a8e04255eb647e30df5c9bc4059334a1d5d4677e73 SHA512 a659cb8f077ddbe5e8de0b9b118d8bcc0c87128c0be4ff14343983e7029594e63ba6fb8a88992dc1f058df3c1ebbbd69cf371bf95a0918954cd0cec14c1cb5cb +DIST pymssql-2.1.5.tar.gz 167928 BLAKE2B c94fc29fa9d83627dbee05095a7c0d6e4e2d42ac34b0e6801bbc757d89728aee409c98519d6e8bfe8d5009f06f88bd23a3e62c050f2c964cb7139bdd3185a0b5 SHA512 7cc7336d4c2fcb7c3958fb3127801e3505fd93259d1aaef40a67941ef5aa519e285cdb04fd378c9712f29b0f8a25ce1747a4a8dc21ec57b004c9f0ceb8f5afab diff --git a/dev-python/pymssql/pymssql-2.1.5.ebuild b/dev-python/pymssql/pymssql-2.1.5.ebuild new file mode 100644 index 000000000000..fcb950bf93ae --- /dev/null +++ b/dev-python/pymssql/pymssql-2.1.5.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +inherit distutils-r1 + +DESCRIPTION="Simple MSSQL python extension module" +HOMEPAGE="https://www.pymssql.org/ https://pypi.org/project/pymssql/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="test" + +# tests need a running instance of freetds +RESTRICT="test" + +RDEPEND=">=dev-db/freetds-0.63[mssql]" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-python/cython[${PYTHON_USEDEP}] + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/unittest2[${PYTHON_USEDEP}] + )" + +PATCHES=( "${FILESDIR}"/${PN}-2.1.3-remove-setuptools_git.patch ) + +python_test() { + py.test -v || die "Tests fail with ${EPYTHON}" +} diff --git a/dev-python/pytest-httpx/metadata.xml b/dev-python/pytest-httpx/metadata.xml index 18982ca43441..fd29bd901502 100644 --- a/dev-python/pytest-httpx/metadata.xml +++ b/dev-python/pytest-httpx/metadata.xml @@ -5,6 +5,7 @@ <email>python@gentoo.org</email> <name>Python</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="pypi">pytest-httpx</remote-id> <remote-id type="github">Colin-b/pytest_httpx</remote-id> diff --git a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild index 22c0041b2e4f..90fe031744e0 100644 --- a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild +++ b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{7,8} ) - +PYTHON_COMPAT=( python3_{7..9} ) inherit distutils-r1 DESCRIPTION="Google's Python argument parsing library" @@ -16,19 +15,13 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86" -RDEPEND=" - dev-python/six[${PYTHON_USEDEP}]" - -DEPEND=" - ${RDEPEND}" +RDEPEND="dev-python/six[${PYTHON_USEDEP}]" -PATCHES=( - "${FILESDIR}"/${PN}-3.1.1-script-install.patch -) +PATCHES=( "${FILESDIR}"/${PN}-3.1.1-script-install.patch ) python_test() { # note: each test needs to be run separately, otherwise they fail - "${PYTHON}" -m gflags._helpers_test -v || die - "${PYTHON}" -m gflags.flags_formatting_test -v || die - "${PYTHON}" -m gflags.flags_unicode_literals_test -v || die + "${EPYTHON}" -m gflags._helpers_test -v || die + "${EPYTHON}" -m gflags.flags_formatting_test -v || die + "${EPYTHON}" -m gflags.flags_unicode_literals_test -v || die } diff --git a/dev-python/pytzdata/metadata.xml b/dev-python/pytzdata/metadata.xml index c966784415f2..d3630d930517 100644 --- a/dev-python/pytzdata/metadata.xml +++ b/dev-python/pytzdata/metadata.xml @@ -9,6 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">sdispater/pytzdata</remote-id> <remote-id type="pypi">pytzdata</remote-id> diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest new file mode 100644 index 000000000000..22831fe8e7bb --- /dev/null +++ b/dev-python/rich/Manifest @@ -0,0 +1 @@ +DIST rich-9.11.1.tar.gz 14050070 BLAKE2B 7dcae32743bfcbbab0af6896f72e865d2a72ab66545168544d065145cf10a2aab4785454e547f011219a85a8aa762f1ed5ebef2b9fb7f44225a2f776835b643d SHA512 2139cb6602d930e9bf1479456a8e6cee812237fb64073db3f23fd8eab64c1c2b3a83c6292f1f90652791100a93961d8ec8036e5d819f1e23159b6b9a75cd1f6c diff --git a/dev-python/rich/metadata.xml b/dev-python/rich/metadata.xml new file mode 100644 index 000000000000..ee58016921d5 --- /dev/null +++ b/dev-python/rich/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>chainsaw@gentoo.org</email> + <name>Tony Vroon</name> + </maintainer> + <stabilize-allarches/> + <upstream> + <remote-id type="pypi">rich</remote-id> + <remote-id type="github">willmcgugan/rich</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/rich/rich-9.11.1.ebuild b/dev-python/rich/rich-9.11.1.ebuild new file mode 100644 index 000000000000..e0b55024c35e --- /dev/null +++ b/dev-python/rich/rich-9.11.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=pyproject.toml +inherit distutils-r1 optfeature + +DESCRIPTION="Validate configuration and produce human readable error messages" +HOMEPAGE="https://github.com/willmcgugan/rich" +SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/commonmark[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest + +pkg_postinst() { + optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets +} diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest index 33a30f5de822..2f9e4ebd9bb3 100644 --- a/dev-python/rpy/Manifest +++ b/dev-python/rpy/Manifest @@ -1 +1,2 @@ DIST rpy2-2.9.0.tar.gz 193062 BLAKE2B 92492821856e516f8f620397cba2e0ffb17718156c7c3a0bc8df8e744f0adf1ea6006e5c762ba99aa142fe06d327a240bf5d616175e81a80d28a21265c9771aa SHA512 55be876fb7316a08f507f3a332ed29d71b52f733c1986482f141e694d66d0e01a51a9c3f0260f6fe0086d7bfbc1f58b678cda4570665e4f1ffdb120c793ef1b2 +DIST rpy2-3.4.2.tar.gz 186064 BLAKE2B 5c800f546240cc33e6341973adae813edcdaa88e90ea0274e97075bc4516ced20828ccc6010ae23aead0b227639158240dae9b678790e0d28f974f10e9ac0e5f SHA512 e754d082bf392de582829bc078b512a071d0c0aa79ce3ed3692ad88b3816863b520a4ef9bbeaccbb2a7284685e470f345ba103e3db78a1c95187c0b554565314 diff --git a/dev-python/rpy/rpy-3.4.2.ebuild b/dev-python/rpy/rpy-3.4.2.ebuild new file mode 100644 index 000000000000..f3c74cb143e7 --- /dev/null +++ b/dev-python/rpy/rpy-3.4.2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_REQ_USE="sqlite" +inherit distutils-r1 flag-o-matic virtualx + +MYSLOT=2 +MY_PN=${PN}${MYSLOT} +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Python interface to the R Programming Language" +HOMEPAGE="https://rpy.sourceforge.net/ + https://pypi.org/project/rpy2/" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +# ggplot2 is a test dep but not in portage +RESTRICT="test" + +RDEPEND=" + >=dev-lang/R-3.2 + dev-python/cffi[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + >=dev-python/pandas-0.13.1[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/tzlocal[${PYTHON_USEDEP}]" +PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]" + +python_compile() { + distutils-r1_python_compile +} + +python_test() { + cd "${BUILD_DIR}"/lib || die + virtx "${EPYTHON}" -m 'rpy2.tests' +} diff --git a/dev-python/socketio-client-nexus/metadata.xml b/dev-python/socketio-client-nexus/metadata.xml index 178ab4da2d8f..972226f29981 100644 --- a/dev-python/socketio-client-nexus/metadata.xml +++ b/dev-python/socketio-client-nexus/metadata.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + <name>Zac Medico</name> + </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="pypi">socketIO-client-nexus</remote-id> <remote-id type="github">nexus-devs/socketIO-client-2.0.3</remote-id> </upstream> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - </maintainer> </pkgmetadata> diff --git a/dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild b/dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild index 806a2fe76a97..1a81504b2899 100644 --- a/dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild +++ b/dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild @@ -1,23 +1,25 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python3_7 ) +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) inherit distutils-r1 MY_PN="socketIO-client-nexus" DESCRIPTION="A socket.io 2.x client library for Python" HOMEPAGE="https://github.com/nexus-devs/socketIO-client-2.0.3/ https://pypi.org/project/socketIO-client-nexus/" +S="${WORKDIR}/${MY_PN}-${PV}" SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -RDEPEND="dev-python/six[${PYTHON_USEDEP}] +# require network +RESTRICT="test" + +RDEPEND=" dev-python/requests[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] dev-python/websocket-client[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-python/uvicorn/metadata.xml b/dev-python/uvicorn/metadata.xml index 1454d51b226a..70a689a65186 100644 --- a/dev-python/uvicorn/metadata.xml +++ b/dev-python/uvicorn/metadata.xml @@ -5,6 +5,7 @@ <email>python@gentoo.org</email> <name>Python</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="pypi">uvicorn</remote-id> <remote-id type="github">encode/uvicorn</remote-id> diff --git a/dev-python/zconfig/files/zconfig-3.5.0-py38.patch b/dev-python/zconfig/files/zconfig-3.5.0-py38.patch new file mode 100644 index 000000000000..ea5e8db7642b --- /dev/null +++ b/dev-python/zconfig/files/zconfig-3.5.0-py38.patch @@ -0,0 +1,105 @@ +Required for python 3.8+ compatibility +https://github.com/zopefoundation/ZConfig/pull/70 +--- a/ZConfig/components/logger/formatter.py ++++ b/ZConfig/components/logger/formatter.py +@@ -248,8 +248,17 @@ def __call__(self): + else: + # A formatter class that supports style, but our style is + # non-standard, so we reach under the covers a bit. ++ # ++ # Python 3.8 adds a validate option, defaulting to True, ++ # which cases the format string to be checked. Since ++ # safe-template is not a standard style, we want to ++ # suppress this. ++ # ++ kwargs = dict() ++ if sys.version_info >= (3, 8): ++ kwargs['validate'] = False + formatter = self.factory(self.format, self.dateformat, +- style='$') ++ style='$', **kwargs) + assert formatter._style._fmt == self.format + formatter._style = stylist + else: +--- a/ZConfig/components/logger/tests/test_formatter.py ++++ b/ZConfig/components/logger/tests/test_formatter.py +@@ -25,6 +25,17 @@ + import ZConfig.components.logger.tests.support + + ++# In Python 3.8, a KeyError raised by string interpolation is re-written ++# into a ValueError reporting a reference to an undefined field. We're ++# not masking the exception, but we want to check for the right one in ++# the tests below (without catching anything else). ++# ++if sys.version_info >= (3, 8): ++ MissingFieldError = ValueError ++else: ++ MissingFieldError = KeyError ++ ++ + class LogFormatStyleTestCase(unittest.TestCase): + + def setUp(self): +@@ -314,7 +325,10 @@ class CustomFormatterFactoryWithoutStyleParamTestCase( + class StylelessFormatter(logging.Formatter): + + def __init__(self, fmt=None, datefmt=None): +- logging.Formatter.__init__(self, fmt=fmt, datefmt=datefmt) ++ kwargs = dict() ++ if sys.version_info >= (3, 8): ++ kwargs['validate'] = False ++ logging.Formatter.__init__(self, fmt=fmt, datefmt=datefmt, **kwargs) + + + def styleless_formatter(fmt=None, datefmt=None): +@@ -552,9 +566,9 @@ def test_classic_arbitrary_field_missing(self): + arbitrary_fields=True) + + # The formatter still breaks when it references an undefined field: +- with self.assertRaises(KeyError) as cm: ++ with self.assertRaises(MissingFieldError) as cm: + formatter.format(self.record) +- self.assertEqual(str(cm.exception), "'undefined_field'") ++ self.assertIn("'undefined_field'", str(cm.exception)) + + def test_classic_arbitrary_field_present(self): + formatter = self.get_formatter( +@@ -574,9 +588,9 @@ def test_format_arbitrary_field_missing(self): + arbitrary_fields=True) + + # The formatter still breaks when it references an undefined field: +- with self.assertRaises(KeyError) as cm: ++ with self.assertRaises(MissingFieldError) as cm: + formatter.format(self.record) +- self.assertEqual(str(cm.exception), "'undefined_field'") ++ self.assertIn("'undefined_field'", str(cm.exception)) + + def test_format_arbitrary_field_present(self): + formatter = self.get_formatter( +@@ -596,9 +610,9 @@ def test_template_arbitrary_field_missing(self): + arbitrary_fields=True) + + # The formatter still breaks when it references an undefined field: +- with self.assertRaises(KeyError) as cm: ++ with self.assertRaises(MissingFieldError) as cm: + formatter.format(self.record) +- self.assertEqual(str(cm.exception), "'undefined_field'") ++ self.assertIn("'undefined_field'", str(cm.exception)) + + def test_template_arbitrary_field_present(self): + formatter = self.get_formatter( + +--- a/ZConfig/components/logger/formatter.py ++++ b/ZConfig/components/logger/formatter.py +@@ -250,7 +250,7 @@ def __call__(self): + # non-standard, so we reach under the covers a bit. + # + # Python 3.8 adds a validate option, defaulting to True, +- # which cases the format string to be checked. Since ++ # which causes the format string to be checked. Since + # safe-template is not a standard style, we want to + # suppress this. + # + + diff --git a/dev-python/zconfig/metadata.xml b/dev-python/zconfig/metadata.xml index ed502c98fcf9..82055c0c5fe6 100644 --- a/dev-python/zconfig/metadata.xml +++ b/dev-python/zconfig/metadata.xml @@ -9,6 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">zopefoundation/ZConfig</remote-id> <remote-id type="pypi">ZConfig</remote-id> diff --git a/dev-python/zconfig/zconfig-3.5.0.ebuild b/dev-python/zconfig/zconfig-3.5.0.ebuild index a84e81f5ef88..174067f20aaa 100644 --- a/dev-python/zconfig/zconfig-3.5.0.ebuild +++ b/dev-python/zconfig/zconfig-3.5.0.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_7 ) - +PYTHON_COMPAT=( python3_{7..9} ) inherit distutils-r1 MY_PN="ZConfig" @@ -13,27 +12,25 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="A configuration library supporting a hierarchical schema-driven configuration model" HOMEPAGE="https://pypi.org/project/ZConfig/" +S="${WORKDIR}/${MY_P}" SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="ZPL" SLOT="0" KEYWORDS="~amd64" -RESTRICT="!test? ( test )" -DEPEND=" +BDEPEND=" test? ( dev-python/docutils[${PYTHON_USEDEP}] dev-python/manuel[${PYTHON_USEDEP}] dev-python/zope-exceptions[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] dev-python/zope-testrunner[${PYTHON_USEDEP}] - ) -" -RDEPEND="" - -S="${WORKDIR}/${MY_P}" + )" DOCS=( CHANGES.rst README.rst ) +PATCHES=( "${FILESDIR}"/${P}-py38.patch ) + distutils_enable_tests nose distutils_enable_sphinx doc dev-python/sphinxcontrib-programoutput diff --git a/mail-filter/spamassassin/spamassassin-3.4.4-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4-r1.ebuild deleted file mode 100644 index 74671a6f239c..000000000000 --- a/mail-filter/spamassassin/spamassassin-3.4.4-r1.ebuild +++ /dev/null @@ -1,316 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit perl-functions systemd toolchain-funcs eapi7-ver - -MY_P="Mail-SpamAssassin-${PV//_/-}" -S="${WORKDIR}/${MY_P}" -DESCRIPTION="An extensible mail filter which can identify and tag spam" -HOMEPAGE="https://spamassassin.apache.org/" -SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test" -RESTRICT="!test? ( test )" - -# The Makefile.PL script checks for dependencies, but only fails if a -# required (i.e. not optional) dependency is missing. We therefore -# require most of the optional modules only at runtime. -REQDEPEND="acct-user/spamd - acct-group/spamd - dev-lang/perl:= - dev-perl/HTML-Parser - dev-perl/Net-DNS - dev-perl/NetAddr-IP - virtual/perl-Archive-Tar - virtual/perl-Digest-SHA - virtual/perl-IO-Zlib - virtual/perl-Time-HiRes - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) - )" - -# SpamAssassin doesn't use libwww-perl except as a fallback for when -# curl/wget are missing, so we depend on one of those instead. Some -# mirrors use https, so we need those utilities to support SSL. -# -# re2c is needed to compile the rules (sa-compile). -# -# We still need the old Digest-SHA1 because razor2 has not been ported -# to Digest-SHA. -OPTDEPEND="app-crypt/gnupg - dev-perl/BSD-Resource - dev-perl/Digest-SHA1 - dev-perl/Encode-Detect - dev-perl/Geo-IP - dev-perl/HTTP-Date - dev-perl/Mail-DKIM - dev-perl/Mail-SPF - dev-perl/Net-Patricia - dev-perl/Net-CIDR-Lite - dev-util/re2c - || ( net-misc/wget[ssl] net-misc/curl[ssl] ) - virtual/perl-MIME-Base64 - virtual/perl-Pod-Parser - berkdb? ( virtual/perl-DB_File ) - ipv6? ( dev-perl/IO-Socket-INET6 ) - ldap? ( dev-perl/perl-ldap ) - mysql? ( - dev-perl/DBI - dev-perl/DBD-mysql - ) - postgres? ( - dev-perl/DBI - dev-perl/DBD-Pg - ) - sqlite? ( - dev-perl/DBI - dev-perl/DBD-SQLite - ) - ssl? ( dev-perl/IO-Socket-SSL )" - -DEPEND="${REQDEPEND} - test? ( - ${OPTDEPEND} - virtual/perl-Test-Harness - )" -RDEPEND="${REQDEPEND} ${OPTDEPEND}" - -# There are a few renames and use-dependent ones in src_istall as well. -DOCS=( - NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes - sql/README.awl procmailrc.example sample-nonspam.txt - sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail - spamd-apache2/README.apache -) - -src_prepare() { - default - - # The sa_compile test does some weird stuff like hopping around in - # the directory tree and calling "make" to create a dist tarball - # from ${S}. It fails, and is more trouble than it's worth... - perl_rm_files t/sa_compile.t - - # The spamc tests (which need the networked spamd daemon) fail for - # irrelevant reasons. It's too hard to disable them (unlike the - # spamd tests themselves -- see src_test), so use a crude - # workaround. - perl_rm_files t/spamc_*.t - - # Upstream bug 7622: this thing needs network access but doesn't - # respect the 'run_net_tests' setting. - perl_rm_files t/urilocalbl_geoip.t - - # Disable plugin by default - sed -i -e 's/^loadplugin/\#loadplugin/g' \ - "rules/init.pre" \ - || die "failed to disable plugins by default" -} - -src_configure() { - # This is how and where the perl-module eclass disables the - # MakeMaker interactive prompt. - export PERL_MM_USE_DEFAULT=1 - - # Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again - # (just to be sure, nobody knows how it could happen in the first place). - # - # We also set the path to the perl executable explictly. This will be - # used to create the initial shebang line in the scripts (bug 62276). - perl Makefile.PL \ - PREFIX="${EPREFIX}/usr" \ - INSTALLDIRS=vendor \ - SYSCONFDIR="${EPREFIX}/etc" \ - DATADIR="${EPREFIX}/usr/share/spamassassin" \ - PERL_BIN="${EPREFIX}/usr/bin/perl" \ - ENABLE_SSL="$(usex ssl)" \ - DESTDIR="${D}" \ - || die 'failed to create a Makefile using Makefile.PL' - - # Now configure spamc. - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile -} - -src_compile() { - emake - use qmail && emake spamc/qmail-spamc -} - -src_install () { - default - - # Create the stub dir used by sa-update and friends - keepdir /var/lib/spamassassin - - # Move spamd to sbin where it belongs. - dodir /usr/sbin - mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd || die "move spamd failed" - - if use qmail; then - dobin spamc/qmail-spamc - fi - - dosym mail/spamassassin /etc/spamassassin - - # Add the init and config scripts. - newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd - newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd - - systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service" - systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \ - "${PN}.service" - - use postgres && dodoc sql/*_pg.sql - use mysql && dodoc sql/*_mysql.sql - use qmail && dodoc spamc/README.qmail - - # Rename some files so that they don't clash with others. - newdoc spamd/README README.spamd - newdoc sql/README README.sql - newdoc ldap/README README.ldap - - insinto /etc/mail/spamassassin/ - insopts -m0400 - newins "${FILESDIR}"/secrets.cf secrets.cf.example - - # Create the directory where sa-update stores its GPG key (if you - # choose to import one). If this directory does not exist, the - # import will fail. This is bug 396307. We expect that the import - # will be performed as root, and making the directory accessible - # only to root prevents a warning on the command-line. - diropts -m0700 - dodir /etc/mail/spamassassin/sa-update-keys - - if use cron; then - # Install the cron job if they want it. - exeinto /etc/cron.daily - newexe "${FILESDIR}/update-spamassassin-rules-r1.cron" \ - update-spamassassin-rules - fi - - # Remove perllocal.pod to avoid file collisions (bug #603338). - perl_delete_localpod - - # The perl-module eclass calls three other functions to clean - # up in src_install. The first fixes references to ${D} in the - # packlist, and is useful to us, too. The other two functions, - # perl_delete_emptybsdir and perl_remove_temppath, don't seem - # to be needed: there are no empty directories, *.bs files, or - # ${D} paths remaining in our installed image. - perl_fix_packlist -} - -src_test() { - # Trick the test suite into skipping the spamd tests. Setting - # SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be - # set in SATest.pm. - export SPAMD_HOST=disabled - default -} - -pkg_preinst() { - if use mysql || use postgres ; then - local _awlwarn=0 - local _v - for _v in ${REPLACING_VERSIONS}; do - if ver_test "${_v}" -lt "3.4.3"; then - _awlwarn=1 - break - fi - done - if [[ ${_awlwarn} == 1 ]] ; then - ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.' - ewarn 'You will need to manually ALTER your tables for them to' - ewarn 'continue working. See the UPGRADE documentation for' - ewarn 'details.' - ewarn - fi - fi -} - -pkg_postinst() { - elog - elog 'No rules are installed by default. You will need to run sa-update' - elog 'at least once, and most likely configure SpamAssassin before it' - elog 'will work.' - - if ! use cron; then - elog - elog 'You should consider a cron job for sa-update. One is provided' - elog 'for daily updates if you enable the "cron" USE flag.' - fi - elog - elog 'Configuration and update help can be found on the wiki:' - elog - elog ' https://wiki.gentoo.org/wiki/SpamAssassin' - elog - - if use mysql || use postgres ; then - local _v - for _v in ${REPLACING_VERSIONS}; do - if ver_test "${_v}" -lt "3.4.3"; then - ewarn - ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.' - ewarn 'You will need to manually ALTER your tables for them to' - ewarn 'continue working. See the UPGRADE documentation for' - ewarn 'details.' - ewarn - - # show this only once - break - fi - done - fi - - ewarn 'If this version of SpamAssassin causes permissions issues' - ewarn 'with your user configurations or bayes databases, then you' - ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service' - ewarn 'configuration file, or remove the --username and --groupname' - ewarn 'flags from the SPAMD_OPTS variable in your systemd service' - ewarn 'configuration file.' - - # Reminder: When we go to EAPI=7, add slashes after ${ROOT} - if [[ ! ~spamd -ef "${ROOT}/var/lib/spamd" ]] ; then - ewarn "The spamd user's home folder has been moved to a new location." - elog - elog "The acct-user/spamd package should have relocated it for you," - elog "but may have failed because your spamd daemon was running." - elog - elog "To fix this:" - elog " - Stop your spamd daemon" - elog " - emerge -1 acct-user/spamd" - elog " - Restart your spamd daemon" - elog " - Remove the old home folder if you want" - elog " rm -rf \"${ROOT}home/spamd\"" - fi - # Reminder: When we go to EAPI=7, add slashes after ${ROOT} - if [[ -e "${ROOT}home/spamd" ]] ; then - ewarn - ewarn "The spamd user's home folder has been moved to a new location." - elog - elog " Old Home: ${ROOT}home/spamd" - elog " New Home: ${ROOT}var/lib/spamd" - elog - elog "You may wish to migrate your data to the new location:" - elog " - Stop your spamd daemon" - elog " - Re-emerge acct-user/spamd to ensure the home folder has been" - elog " updated to the new location, now that the daemon isn't running:" - elog " # emerge -1 acct-user/spamd" - elog " # echo ~spamd" - elog " - Migrate the contents from the old location to the new home" - elog " For example:" - elog " # cp -Rpi \"${ROOT}home/spamd/\" \"${ROOT}var/lib/\"" - elog " - Remove the old home folder" - elog " # rm -rf \"${ROOT}home/spamd\"" - elog " - Restart your spamd daemon" - elog - elog "If you do not wish to migrate data, you should remove the old" - elog "home folder from your system as it is not used." - fi -} diff --git a/mail-filter/spamassassin/spamassassin-3.4.4-r2.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4-r2.ebuild deleted file mode 100644 index 1ca1c7c15c24..000000000000 --- a/mail-filter/spamassassin/spamassassin-3.4.4-r2.ebuild +++ /dev/null @@ -1,314 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit perl-functions systemd toolchain-funcs - -MY_P="Mail-SpamAssassin-${PV//_/-}" -S="${WORKDIR}/${MY_P}" -DESCRIPTION="An extensible mail filter which can identify and tag spam" -HOMEPAGE="https://spamassassin.apache.org/" -SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test" -RESTRICT="!test? ( test )" - -# The Makefile.PL script checks for dependencies, but only fails if a -# required (i.e. not optional) dependency is missing. We therefore -# require most of the optional modules only at runtime. -REQDEPEND="acct-user/spamd - acct-group/spamd - dev-lang/perl:= - dev-perl/HTML-Parser - dev-perl/Net-DNS - dev-perl/NetAddr-IP - virtual/perl-Archive-Tar - virtual/perl-Digest-SHA - virtual/perl-IO-Zlib - virtual/perl-Time-HiRes - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) - )" - -# SpamAssassin doesn't use libwww-perl except as a fallback for when -# curl/wget are missing, so we depend on one of those instead. Some -# mirrors use https, so we need those utilities to support SSL. -# -# re2c is needed to compile the rules (sa-compile). -# -# We still need the old Digest-SHA1 because razor2 has not been ported -# to Digest-SHA. -OPTDEPEND="app-crypt/gnupg - dev-perl/BSD-Resource - dev-perl/Digest-SHA1 - dev-perl/Encode-Detect - dev-perl/Geo-IP - dev-perl/HTTP-Date - dev-perl/Mail-DKIM - dev-perl/Mail-SPF - dev-perl/Net-Patricia - dev-perl/Net-CIDR-Lite - dev-util/re2c - || ( net-misc/wget[ssl] net-misc/curl[ssl] ) - virtual/perl-MIME-Base64 - virtual/perl-Pod-Parser - berkdb? ( virtual/perl-DB_File ) - ipv6? ( dev-perl/IO-Socket-INET6 ) - ldap? ( dev-perl/perl-ldap ) - mysql? ( - dev-perl/DBI - dev-perl/DBD-mysql - ) - postgres? ( - dev-perl/DBI - dev-perl/DBD-Pg - ) - sqlite? ( - dev-perl/DBI - dev-perl/DBD-SQLite - ) - ssl? ( dev-perl/IO-Socket-SSL )" - -DEPEND="${REQDEPEND} - test? ( - ${OPTDEPEND} - virtual/perl-Test-Harness - )" -RDEPEND="${REQDEPEND} ${OPTDEPEND}" - -# There are a few renames and use-dependent ones in src_istall as well. -DOCS=( - NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes - sql/README.awl procmailrc.example sample-nonspam.txt - sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail - spamd-apache2/README.apache -) - -src_prepare() { - default - - # The sa_compile test does some weird stuff like hopping around in - # the directory tree and calling "make" to create a dist tarball - # from ${S}. It fails, and is more trouble than it's worth... - perl_rm_files t/sa_compile.t - - # The spamc tests (which need the networked spamd daemon) fail for - # irrelevant reasons. It's too hard to disable them (unlike the - # spamd tests themselves -- see src_test), so use a crude - # workaround. - perl_rm_files t/spamc_*.t - - # Upstream bug 7622: this thing needs network access but doesn't - # respect the 'run_net_tests' setting. - perl_rm_files t/urilocalbl_geoip.t - - # Disable plugin by default - sed -i -e 's/^loadplugin/\#loadplugin/g' \ - "rules/init.pre" \ - || die "failed to disable plugins by default" -} - -src_configure() { - # This is how and where the perl-module eclass disables the - # MakeMaker interactive prompt. - export PERL_MM_USE_DEFAULT=1 - - # Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again - # (just to be sure, nobody knows how it could happen in the first place). - # - # We also set the path to the perl executable explictly. This will be - # used to create the initial shebang line in the scripts (bug 62276). - perl Makefile.PL \ - PREFIX="${EPREFIX}/usr" \ - INSTALLDIRS=vendor \ - SYSCONFDIR="${EPREFIX}/etc" \ - DATADIR="${EPREFIX}/usr/share/spamassassin" \ - PERL_BIN="${EPREFIX}/usr/bin/perl" \ - ENABLE_SSL="$(usex ssl)" \ - DESTDIR="${D}" \ - || die 'failed to create a Makefile using Makefile.PL' - - # Now configure spamc. - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile -} - -src_compile() { - emake - use qmail && emake spamc/qmail-spamc -} - -src_install () { - default - - # Create the stub dir used by sa-update and friends - keepdir /var/lib/spamassassin - - # Move spamd to sbin where it belongs. - dodir /usr/sbin - mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd || die "move spamd failed" - - if use qmail; then - dobin spamc/qmail-spamc - fi - - dosym mail/spamassassin /etc/spamassassin - - # Add the init and config scripts. - newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd - newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd - - systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service" - systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \ - "${PN}.service" - - use postgres && dodoc sql/*_pg.sql - use mysql && dodoc sql/*_mysql.sql - use qmail && dodoc spamc/README.qmail - - # Rename some files so that they don't clash with others. - newdoc spamd/README README.spamd - newdoc sql/README README.sql - newdoc ldap/README README.ldap - - insinto /etc/mail/spamassassin/ - insopts -m0400 - newins "${FILESDIR}"/secrets.cf secrets.cf.example - - # Create the directory where sa-update stores its GPG key (if you - # choose to import one). If this directory does not exist, the - # import will fail. This is bug 396307. We expect that the import - # will be performed as root, and making the directory accessible - # only to root prevents a warning on the command-line. - diropts -m0700 - dodir /etc/mail/spamassassin/sa-update-keys - - if use cron; then - # Install the cron job if they want it. - exeinto /etc/cron.daily - newexe "${FILESDIR}/update-spamassassin-rules-r1.cron" \ - update-spamassassin-rules - fi - - # Remove perllocal.pod to avoid file collisions (bug #603338). - perl_delete_localpod - - # The perl-module eclass calls three other functions to clean - # up in src_install. The first fixes references to ${D} in the - # packlist, and is useful to us, too. The other two functions, - # perl_delete_emptybsdir and perl_remove_temppath, don't seem - # to be needed: there are no empty directories, *.bs files, or - # ${D} paths remaining in our installed image. - perl_fix_packlist -} - -src_test() { - # Trick the test suite into skipping the spamd tests. Setting - # SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be - # set in SATest.pm. - export SPAMD_HOST=disabled - default -} - -pkg_preinst() { - if use mysql || use postgres ; then - local _awlwarn=0 - local _v - for _v in ${REPLACING_VERSIONS}; do - if ver_test "${_v}" -lt "3.4.3"; then - _awlwarn=1 - break - fi - done - if [[ ${_awlwarn} == 1 ]] ; then - ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.' - ewarn 'You will need to manually ALTER your tables for them to' - ewarn 'continue working. See the UPGRADE documentation for' - ewarn 'details.' - ewarn - fi - fi -} - -pkg_postinst() { - elog - elog 'No rules are installed by default. You will need to run sa-update' - elog 'at least once, and most likely configure SpamAssassin before it' - elog 'will work.' - - if ! use cron; then - elog - elog 'You should consider a cron job for sa-update. One is provided' - elog 'for daily updates if you enable the "cron" USE flag.' - fi - elog - elog 'Configuration and update help can be found on the wiki:' - elog - elog ' https://wiki.gentoo.org/wiki/SpamAssassin' - elog - - if use mysql || use postgres ; then - local _v - for _v in ${REPLACING_VERSIONS}; do - if ver_test "${_v}" -lt "3.4.3"; then - ewarn - ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.' - ewarn 'You will need to manually ALTER your tables for them to' - ewarn 'continue working. See the UPGRADE documentation for' - ewarn 'details.' - ewarn - - # show this only once - break - fi - done - fi - - ewarn 'If this version of SpamAssassin causes permissions issues' - ewarn 'with your user configurations or bayes databases, then you' - ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service' - ewarn 'configuration file, or remove the --username and --groupname' - ewarn 'flags from the SPAMD_OPTS variable in your systemd service' - ewarn 'configuration file.' - - if [[ ! ~spamd -ef "${ROOT}/var/lib/spamd" ]] ; then - ewarn "The spamd user's home folder has been moved to a new location." - elog - elog "The acct-user/spamd package should have relocated it for you," - elog "but may have failed because your spamd daemon was running." - elog - elog "To fix this:" - elog " - Stop your spamd daemon" - elog " - emerge -1 acct-user/spamd" - elog " - Restart your spamd daemon" - elog " - Remove the old home folder if you want" - elog " rm -rf \"${ROOT}/home/spamd\"" - fi - if [[ -e "${ROOT}/home/spamd" ]] ; then - ewarn - ewarn "The spamd user's home folder has been moved to a new location." - elog - elog " Old Home: ${ROOT}/home/spamd" - elog " New Home: ${ROOT}/var/lib/spamd" - elog - elog "You may wish to migrate your data to the new location:" - elog " - Stop your spamd daemon" - elog " - Re-emerge acct-user/spamd to ensure the home folder has been" - elog " updated to the new location, now that the daemon isn't running:" - elog " # emerge -1 acct-user/spamd" - elog " # echo ~spamd" - elog " - Migrate the contents from the old location to the new home" - elog " For example:" - elog " # cp -Rpi \"${ROOT}/home/spamd/\" \"${ROOT}/var/lib/\"" - elog " - Remove the old home folder" - elog " # rm -rf \"${ROOT}/home/spamd\"" - elog " - Restart your spamd daemon" - elog - elog "If you do not wish to migrate data, you should remove the old" - elog "home folder from your system as it is not used." - fi -} diff --git a/mail-filter/spamassassin/spamassassin-3.4.4-r3.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4-r3.ebuild deleted file mode 100644 index 97059ad27634..000000000000 --- a/mail-filter/spamassassin/spamassassin-3.4.4-r3.ebuild +++ /dev/null @@ -1,310 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit perl-functions systemd toolchain-funcs - -MY_P="Mail-SpamAssassin-${PV//_/-}" -S="${WORKDIR}/${MY_P}" -DESCRIPTION="An extensible mail filter which can identify and tag spam" -HOMEPAGE="https://spamassassin.apache.org/" -SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test" -RESTRICT="!test? ( test )" - -# The Makefile.PL script checks for dependencies, but only fails if a -# required (i.e. not optional) dependency is missing. We therefore -# require most of the optional modules only at runtime. -REQDEPEND="acct-user/spamd - acct-group/spamd - dev-lang/perl:= - dev-perl/HTML-Parser - dev-perl/Net-DNS - dev-perl/NetAddr-IP - virtual/perl-Archive-Tar - virtual/perl-Digest-SHA - virtual/perl-IO-Zlib - virtual/perl-Time-HiRes - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) - )" - -# SpamAssassin doesn't use libwww-perl except as a fallback for when -# curl/wget are missing, so we depend on one of those instead. Some -# mirrors use https, so we need those utilities to support SSL. -# -# re2c is needed to compile the rules (sa-compile). -# -# We still need the old Digest-SHA1 because razor2 has not been ported -# to Digest-SHA. -OPTDEPEND="app-crypt/gnupg - dev-perl/BSD-Resource - dev-perl/Digest-SHA1 - dev-perl/Encode-Detect - || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) - dev-perl/HTTP-Date - dev-perl/Mail-DKIM - dev-perl/Mail-SPF - dev-perl/Net-Patricia - dev-perl/Net-CIDR-Lite - dev-util/re2c - || ( net-misc/wget[ssl] net-misc/curl[ssl] ) - virtual/perl-MIME-Base64 - virtual/perl-Pod-Parser - berkdb? ( virtual/perl-DB_File ) - ipv6? ( dev-perl/IO-Socket-INET6 ) - ldap? ( dev-perl/perl-ldap ) - mysql? ( - dev-perl/DBI - dev-perl/DBD-mysql - ) - postgres? ( - dev-perl/DBI - dev-perl/DBD-Pg - ) - sqlite? ( - dev-perl/DBI - dev-perl/DBD-SQLite - ) - ssl? ( dev-perl/IO-Socket-SSL )" - -DEPEND="${REQDEPEND} - test? ( - ${OPTDEPEND} - virtual/perl-Test-Harness - )" -RDEPEND="${REQDEPEND} ${OPTDEPEND}" - -# There are a few renames and use-dependent ones in src_istall as well. -DOCS=( - NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes - sql/README.awl procmailrc.example sample-nonspam.txt - sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail - spamd-apache2/README.apache -) - -src_prepare() { - default - - # The sa_compile test does some weird stuff like hopping around in - # the directory tree and calling "make" to create a dist tarball - # from ${S}. It fails, and is more trouble than it's worth... - perl_rm_files t/sa_compile.t - - # The spamc tests (which need the networked spamd daemon) fail for - # irrelevant reasons. It's too hard to disable them (unlike the - # spamd tests themselves -- see src_test), so use a crude - # workaround. - perl_rm_files t/spamc_*.t - - # Disable plugin by default - sed -i -e 's/^loadplugin/\#loadplugin/g' \ - "rules/init.pre" \ - || die "failed to disable plugins by default" -} - -src_configure() { - # This is how and where the perl-module eclass disables the - # MakeMaker interactive prompt. - export PERL_MM_USE_DEFAULT=1 - - # Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again - # (just to be sure, nobody knows how it could happen in the first place). - # - # We also set the path to the perl executable explictly. This will be - # used to create the initial shebang line in the scripts (bug 62276). - perl Makefile.PL \ - PREFIX="${EPREFIX}/usr" \ - INSTALLDIRS=vendor \ - SYSCONFDIR="${EPREFIX}/etc" \ - DATADIR="${EPREFIX}/usr/share/spamassassin" \ - PERL_BIN="${EPREFIX}/usr/bin/perl" \ - ENABLE_SSL="$(usex ssl)" \ - DESTDIR="${D}" \ - || die 'failed to create a Makefile using Makefile.PL' - - # Now configure spamc. - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile -} - -src_compile() { - emake - use qmail && emake spamc/qmail-spamc -} - -src_install () { - default - - # Create the stub dir used by sa-update and friends - keepdir /var/lib/spamassassin - - # Move spamd to sbin where it belongs. - dodir /usr/sbin - mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd || die "move spamd failed" - - if use qmail; then - dobin spamc/qmail-spamc - fi - - dosym mail/spamassassin /etc/spamassassin - - # Add the init and config scripts. - newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd - newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd - - systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service" - systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \ - "${PN}.service" - - use postgres && dodoc sql/*_pg.sql - use mysql && dodoc sql/*_mysql.sql - use qmail && dodoc spamc/README.qmail - - # Rename some files so that they don't clash with others. - newdoc spamd/README README.spamd - newdoc sql/README README.sql - newdoc ldap/README README.ldap - - insinto /etc/mail/spamassassin/ - insopts -m0400 - newins "${FILESDIR}"/secrets.cf secrets.cf.example - - # Create the directory where sa-update stores its GPG key (if you - # choose to import one). If this directory does not exist, the - # import will fail. This is bug 396307. We expect that the import - # will be performed as root, and making the directory accessible - # only to root prevents a warning on the command-line. - diropts -m0700 - dodir /etc/mail/spamassassin/sa-update-keys - - if use cron; then - # Install the cron job if they want it. - exeinto /etc/cron.daily - newexe "${FILESDIR}/update-spamassassin-rules-r1.cron" \ - update-spamassassin-rules - fi - - # Remove perllocal.pod to avoid file collisions (bug #603338). - perl_delete_localpod - - # The perl-module eclass calls three other functions to clean - # up in src_install. The first fixes references to ${D} in the - # packlist, and is useful to us, too. The other two functions, - # perl_delete_emptybsdir and perl_remove_temppath, don't seem - # to be needed: there are no empty directories, *.bs files, or - # ${D} paths remaining in our installed image. - perl_fix_packlist -} - -src_test() { - # Trick the test suite into skipping the spamd tests. Setting - # SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be - # set in SATest.pm. - export SPAMD_HOST=disabled - default -} - -pkg_preinst() { - if use mysql || use postgres ; then - local _awlwarn=0 - local _v - for _v in ${REPLACING_VERSIONS}; do - if ver_test "${_v}" -lt "3.4.3"; then - _awlwarn=1 - break - fi - done - if [[ ${_awlwarn} == 1 ]] ; then - ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.' - ewarn 'You will need to manually ALTER your tables for them to' - ewarn 'continue working. See the UPGRADE documentation for' - ewarn 'details.' - ewarn - fi - fi -} - -pkg_postinst() { - elog - elog 'No rules are installed by default. You will need to run sa-update' - elog 'at least once, and most likely configure SpamAssassin before it' - elog 'will work.' - - if ! use cron; then - elog - elog 'You should consider a cron job for sa-update. One is provided' - elog 'for daily updates if you enable the "cron" USE flag.' - fi - elog - elog 'Configuration and update help can be found on the wiki:' - elog - elog ' https://wiki.gentoo.org/wiki/SpamAssassin' - elog - - if use mysql || use postgres ; then - local _v - for _v in ${REPLACING_VERSIONS}; do - if ver_test "${_v}" -lt "3.4.3"; then - ewarn - ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.' - ewarn 'You will need to manually ALTER your tables for them to' - ewarn 'continue working. See the UPGRADE documentation for' - ewarn 'details.' - ewarn - - # show this only once - break - fi - done - fi - - ewarn 'If this version of SpamAssassin causes permissions issues' - ewarn 'with your user configurations or bayes databases, then you' - ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service' - ewarn 'configuration file, or remove the --username and --groupname' - ewarn 'flags from the SPAMD_OPTS variable in your systemd service' - ewarn 'configuration file.' - - if [[ ! ~spamd -ef "${ROOT}/var/lib/spamd" ]] ; then - ewarn "The spamd user's home folder has been moved to a new location." - elog - elog "The acct-user/spamd package should have relocated it for you," - elog "but may have failed because your spamd daemon was running." - elog - elog "To fix this:" - elog " - Stop your spamd daemon" - elog " - emerge -1 acct-user/spamd" - elog " - Restart your spamd daemon" - elog " - Remove the old home folder if you want" - elog " rm -rf \"${ROOT}/home/spamd\"" - fi - if [[ -e "${ROOT}/home/spamd" ]] ; then - ewarn - ewarn "The spamd user's home folder has been moved to a new location." - elog - elog " Old Home: ${ROOT}/home/spamd" - elog " New Home: ${ROOT}/var/lib/spamd" - elog - elog "You may wish to migrate your data to the new location:" - elog " - Stop your spamd daemon" - elog " - Re-emerge acct-user/spamd to ensure the home folder has been" - elog " updated to the new location, now that the daemon isn't running:" - elog " # emerge -1 acct-user/spamd" - elog " # echo ~spamd" - elog " - Migrate the contents from the old location to the new home" - elog " For example:" - elog " # cp -Rpi \"${ROOT}/home/spamd/\" \"${ROOT}/var/lib/\"" - elog " - Remove the old home folder" - elog " # rm -rf \"${ROOT}/home/spamd\"" - elog " - Restart your spamd daemon" - elog - elog "If you do not wish to migrate data, you should remove the old" - elog "home folder from your system as it is not used." - fi -} diff --git a/mail-filter/spamassassin/spamassassin-3.4.4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4.ebuild deleted file mode 100644 index 14997d22b436..000000000000 --- a/mail-filter/spamassassin/spamassassin-3.4.4.ebuild +++ /dev/null @@ -1,284 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit perl-functions systemd toolchain-funcs user eapi7-ver - -MY_P="Mail-SpamAssassin-${PV//_/-}" -S="${WORKDIR}/${MY_P}" -DESCRIPTION="An extensible mail filter which can identify and tag spam" -HOMEPAGE="https://spamassassin.apache.org/" -SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test" -RESTRICT="!test? ( test )" - -# The Makefile.PL script checks for dependencies, but only fails if a -# required (i.e. not optional) dependency is missing. We therefore -# require most of the optional modules only at runtime. -REQDEPEND="dev-lang/perl:= - dev-perl/HTML-Parser - dev-perl/Net-DNS - dev-perl/NetAddr-IP - virtual/perl-Archive-Tar - virtual/perl-Digest-SHA - virtual/perl-IO-Zlib - virtual/perl-Time-HiRes - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) - )" - -# SpamAssassin doesn't use libwww-perl except as a fallback for when -# curl/wget are missing, so we depend on one of those instead. Some -# mirrors use https, so we need those utilities to support SSL. -# -# re2c is needed to compile the rules (sa-compile). -# -# We still need the old Digest-SHA1 because razor2 has not been ported -# to Digest-SHA. -OPTDEPEND="app-crypt/gnupg - dev-perl/BSD-Resource - dev-perl/Digest-SHA1 - dev-perl/Encode-Detect - dev-perl/Geo-IP - dev-perl/HTTP-Date - dev-perl/Mail-DKIM - dev-perl/Mail-SPF - dev-perl/Net-Patricia - dev-perl/Net-CIDR-Lite - dev-util/re2c - || ( net-misc/wget[ssl] net-misc/curl[ssl] ) - virtual/perl-MIME-Base64 - virtual/perl-Pod-Parser - berkdb? ( virtual/perl-DB_File ) - ipv6? ( dev-perl/IO-Socket-INET6 ) - ldap? ( dev-perl/perl-ldap ) - mysql? ( - dev-perl/DBI - dev-perl/DBD-mysql - ) - postgres? ( - dev-perl/DBI - dev-perl/DBD-Pg - ) - sqlite? ( - dev-perl/DBI - dev-perl/DBD-SQLite - ) - ssl? ( dev-perl/IO-Socket-SSL )" - -DEPEND="${REQDEPEND} - test? ( - ${OPTDEPEND} - virtual/perl-Test-Harness - )" -RDEPEND="${REQDEPEND} ${OPTDEPEND}" - -PATCHES=( -) - -src_prepare() { - default - - # The sa_compile test does some weird stuff like hopping around in - # the directory tree and calling "make" to create a dist tarball - # from ${S}. It fails, and is more trouble than it's worth... - perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test' - - # The spamc tests (which need the networked spamd daemon) fail for - # irrelevant reasons. It's too hard to disable them (unlike the - # spamd tests themselves -- see src_test), so use a crude - # workaround. - perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests' - - # Upstream bug 7622: this thing needs network access but doesn't - # respect the 'run_net_tests' setting. - perl_rm_files t/urilocalbl_geoip.t \ - || die 'failed to remove urilocalbl_geoip tests' -} - -src_configure() { - # This is how and where the perl-module eclass disables the - # MakeMaker interactive prompt. - export PERL_MM_USE_DEFAULT=1 - - # Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again - # (just to be sure, nobody knows how it could happen in the first place). - # - # We also set the path to the perl executable explictly. This will be - # used to create the initial shebang line in the scripts (bug 62276). - perl Makefile.PL \ - PREFIX="${EPREFIX}/usr" \ - INSTALLDIRS=vendor \ - SYSCONFDIR="${EPREFIX}/etc" \ - DATADIR="${EPREFIX}/usr/share/spamassassin" \ - PERL_BIN="${EPREFIX}/usr/bin/perl" \ - ENABLE_SSL="$(usex ssl)" \ - DESTDIR="${D}" \ - || die 'failed to create a Makefile using Makefile.PL' - - # Now configure spamc. - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile -} - -src_compile() { - emake - use qmail && emake spamc/qmail-spamc -} - -src_install() { - emake install - einstalldocs - - # Create the stub dir used by sa-update and friends - keepdir /var/lib/spamassassin - - # Move spamd to sbin where it belongs. - dodir /usr/sbin - mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd || die "move spamd failed" - - if use qmail; then - dobin spamc/qmail-spamc - fi - - dosym mail/spamassassin /etc/spamassassin - - # Disable plugin by default - sed -i -e 's/^loadplugin/\#loadplugin/g' \ - "${ED}/etc/mail/spamassassin/init.pre" \ - || die "failed to disable plugins by default" - - # Add the init and config scripts. - newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd - newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd - - systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service" - systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \ - "${PN}.service" - - use postgres && dodoc sql/*_pg.sql - use mysql && dodoc sql/*_mysql.sql - - dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \ - sql/README.awl procmailrc.example sample-nonspam.txt \ - sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \ - spamd-apache2/README.apache - - # Rename some files so that they don't clash with others. - newdoc spamd/README README.spamd - newdoc sql/README README.sql - newdoc ldap/README README.ldap - - if use qmail; then - dodoc spamc/README.qmail - fi - - insinto /etc/mail/spamassassin/ - insopts -m0400 - newins "${FILESDIR}"/secrets.cf secrets.cf.example - - # Create the directory where sa-update stores its GPG key (if you - # choose to import one). If this directory does not exist, the - # import will fail. This is bug 396307. We expect that the import - # will be performed as root, and making the directory accessible - # only to root prevents a warning on the command-line. - diropts -m0700 - dodir /etc/mail/spamassassin/sa-update-keys - - if use cron; then - # Install the cron job if they want it. - exeinto /etc/cron.daily - newexe "${FILESDIR}/update-spamassassin-rules-r1.cron" \ - update-spamassassin-rules - fi - - # Remove perllocal.pod to avoid file collisions (bug #603338). - perl_delete_localpod || die "failed to remove perllocal.pod" - - # The perl-module eclass calls three other functions to clean - # up in src_install. The first fixes references to ${D} in the - # packlist, and is useful to us, too. The other two functions, - # perl_delete_emptybsdir and perl_remove_temppath, don't seem - # to be needed: there are no empty directories, *.bs files, or - # ${D} paths remaining in our installed image. - perl_fix_packlist || die "failed to fix paths in packlist" -} - -src_test() { - # Trick the test suite into skipping the spamd tests. Setting - # SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be - # set in SATest.pm. - export SPAMD_HOST=disabled - default -} - -pkg_preinst() { - # The spamd daemon runs as this user. Use a real home directory so - # that it can hold SA configuration. - enewuser spamd -1 -1 /home/spamd - - if use mysql || use postgres ; then - local _awlwarn=0 - local _v - for _v in ${REPLACING_VERSIONS}; do - if ver_test "${_v}" -lt "3.4.3"; then - _awlwarn=1 - break - fi - done - if [[ ${_awlwarn} == 1 ]] ; then - ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.' - ewarn 'You will need to manually ALTER your tables for them to' - ewarn 'continue working. See the UPGRADE documentation for' - ewarn 'details.' - ewarn - fi - fi -} - -pkg_postinst() { - elog - elog 'No rules are installed by default. You will need to run sa-update' - elog 'at least once, and most likely configure SpamAssassin before it' - elog 'will work.' - - if ! use cron; then - elog - elog 'You should consider a cron job for sa-update. One is provided' - elog 'for daily updates if you enable the "cron" USE flag.' - fi - elog - elog 'Configuration and update help can be found on the wiki:' - elog - elog ' https://wiki.gentoo.org/wiki/SpamAssassin' - elog - - if use mysql || use postgres ; then - local _v - for _v in ${REPLACING_VERSIONS}; do - if ver_test "${_v}" -lt "3.4.3"; then - ewarn - ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.' - ewarn 'You will need to manually ALTER your tables for them to' - ewarn 'continue working. See the UPGRADE documentation for' - ewarn 'details.' - ewarn - - # show this only once - break - fi - done - fi - - ewarn 'If this version of SpamAssassin causes permissions issues' - ewarn 'with your user configurations or bayes databases, then you' - ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service' - ewarn 'configuration file, or remove the --username and --groupname' - ewarn 'flags from the SPAMD_OPTS variable in your systemd service' - ewarn 'configuration file.' -} diff --git a/media-sound/sndio/files/sndiod b/media-sound/sndio/files/sndiod index ee38dcb97d94..ce4ebe523c16 100644 --- a/media-sound/sndio/files/sndiod +++ b/media-sound/sndio/files/sndiod @@ -1,3 +1,2 @@ #!/sbin/openrc-run command="sndiod" -command_user="sndiod" diff --git a/media-sound/sndio/sndio-1.7.0.ebuild b/media-sound/sndio/sndio-1.7.0-r1.ebuild index fcc60e727985..fcc60e727985 100644 --- a/media-sound/sndio/sndio-1.7.0.ebuild +++ b/media-sound/sndio/sndio-1.7.0-r1.ebuild diff --git a/net-im/err/Manifest b/net-im/err/Manifest index 3b52fdf76ff9..96da875a11a0 100644 --- a/net-im/err/Manifest +++ b/net-im/err/Manifest @@ -1 +1 @@ -DIST errbot-6.1.4.tar.gz 207370 BLAKE2B 187e87cc36393f85c1405a29d332d703cdd2ac9d9c6b50178ff7382bc5feb620b69a77dc21ce8144fc24045f11067865c7273118fc25ec1ad9afb93d6ccc635e SHA512 60cc8f070e2420e4ef5f0124eb6d03b3cf01c44e148ebb8b92f5b504eb6968c754fd82771da9528daab62c9e9f4d6ef97ab1063f1093163208521b26e36b2f2d +DIST err-6.1.7.tar.gz 1359383 BLAKE2B 400bbf4a4180f74993a4414dc55f07a69b34b04277fecd073bd860df9dcd5da4873949df766c0c2f6b7a43b4e87153d0aa77b0abaf95bf9702d76c3c7b290abe SHA512 cd0dadc5ff380c71631bae7711bdba7345046fbe14e369c8efa8eed98752b9ea03f6e4fa3171df257a9d76686c610e28fac5f39f7e8e107348a5746e4354694b diff --git a/net-im/err/err-6.1.4.ebuild b/net-im/err/err-6.1.7.ebuild index 65c20b5d54fb..981a4a81c279 100644 --- a/net-im/err/err-6.1.4.ebuild +++ b/net-im/err/err-6.1.7.ebuild @@ -1,41 +1,42 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_7 ) +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 MY_PN="errbot" MY_P="${MY_PN}-${PV}" -inherit distutils-r1 user - DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable" HOMEPAGE="https://errbot.readthedocs.io/en/latest/" -SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +SRC_URI="https://github.com/errbotio/errbot/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" LICENSE="GPL-3" SLOT="0" IUSE="irc +xmpp" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND=" +DEPEND=" + acct-group/err + acct-user/err" +RDEPEND="${DEPEND} dev-python/ansi[${PYTHON_USEDEP}] dev-python/bottle[${PYTHON_USEDEP}] dev-python/colorlog[${PYTHON_USEDEP}] dev-python/cryptography[${PYTHON_USEDEP}] dev-python/daemonize[${PYTHON_USEDEP}] - dev-python/dnspython[${PYTHON_USEDEP}] - >=dev-python/dulwich-0.19.16[${PYTHON_USEDEP}] + dev-python/deepmerge[${PYTHON_USEDEP}] + dev-python/dulwich[${PYTHON_USEDEP}] dev-python/flask[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}] - <dev-python/markdown-3.0[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] dev-python/pyopenssl[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/webtest[${PYTHON_USEDEP}] - dev-python/yapsy[${PYTHON_USEDEP}] irc? ( dev-python/irc[${PYTHON_USEDEP}] ) @@ -45,11 +46,10 @@ RDEPEND=" dev-python/slixmpp[${PYTHON_USEDEP}] ) " - -PATCHES=( "${FILESDIR}/${P}-slixmpp.patch" ) - S="${WORKDIR}/${MY_P}" +distutils_enable_tests pytest + # NOTES: # 1. Support for BOT_SENTRY option is missing, cause # we do not have apropriate packages in portage yet @@ -57,23 +57,26 @@ S="${WORKDIR}/${MY_P}" # 3. Internal web server is temporarily removed (rocket-err from requires.txt) # 4. pygments-markdown-lexer dependency(needed only for debugging?) is temporarily removed (pygments-markdown-lexer from requires.txt) -pkg_setup() { - ebegin "Creating err group and user" - enewgroup 'err' - enewuser 'err' -1 -1 -1 'err' - eend ${?} -} - python_prepare_all() { - sed -i \ - -e '/rocket-errbot/d' \ - -e 's/dnspython3/dnspython/' \ - -e '/pygments-markdown-lexer/d' \ - setup.py || die + sed -i -e '/pygments-markdown-lexer/d' setup.py || die + + # NameError: name 'slack' is not defined + rm tests/backend_tests/slack_test.py || die distutils-r1_python_prepare_all } +python_test() { + local deselect=( + --deselect tests/commands_test.py::test_plugin_cycle + --deselect tests/commands_test.py::test_broken_plugin + --deselect tests/commands_test.py::test_backup + --deselect tests/plugin_management_test.py::test_check_dependencies_requi + ) + + pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}" +} + python_install_all() { distutils-r1_python_install_all diff --git a/net-im/err/files/err-6.1.4-slixmpp.patch b/net-im/err/files/err-6.1.4-slixmpp.patch deleted file mode 100644 index ccccc171f238..000000000000 --- a/net-im/err/files/err-6.1.4-slixmpp.patch +++ /dev/null @@ -1,190 +0,0 @@ -From e68c539c727c7275665a198fc7a217a3c1ad3be2 Mon Sep 17 00:00:00 2001 -From: Birger Schacht <1143280+bisco2@users.noreply.github.com> -Date: Sat, 11 Jul 2020 11:20:53 +0000 -Subject: [PATCH] Replace sleekxmpp with slixmpp (#1430) - -* Start moving to slixmpp - -* Pass a default value for ssl_version to the XMPPConnection ---- - .../plugin_development/backend_specifics.rst | 6 +-- - errbot/backends/xmpp.py | 49 +++++++++---------- - setup.py | 4 +- - -diff --git a/errbot/backends/xmpp.py b/errbot/backends/xmpp.py -index 08f49340..e27c2893 100644 ---- a/errbot/backends/xmpp.py -+++ b/errbot/backends/xmpp.py -@@ -2,7 +2,6 @@ - import sys - from functools import lru_cache - --from threading import Thread - from time import sleep - - from errbot.backends.base import Message, Room, Presence, RoomNotJoinedError, Identifier, RoomOccupant, Person -@@ -13,10 +12,10 @@ - log = logging.getLogger(__name__) - - try: -- from sleekxmpp import ClientXMPP -- from sleekxmpp.xmlstream import resolver, cert -- from sleekxmpp import JID -- from sleekxmpp.exceptions import IqError -+ from slixmpp import ClientXMPP -+ from slixmpp.xmlstream import resolver, cert -+ from slixmpp import JID -+ from slixmpp.exceptions import IqError - - except ImportError: - log.exception("Could not start the XMPP backend") -@@ -114,15 +113,10 @@ def join(self, username=None, password=None): - :meth:`create` on it first. - """ - room = str(self) -- self.xep0045.joinMUC(room, username, password=password, wait=True) -+ self.xep0045.join_muc(room, username, password=password, wait=True) - self._bot.conn.add_event_handler(f'muc::{room}::got_online', self._bot.user_joined_chat) - self._bot.conn.add_event_handler(f'muc::{room}::got_offline', self._bot.user_left_chat) -- # Room configuration can only be done once a MUC presence stanza -- # has been received from the server. This HAS to take place in a -- # separate thread because of how SleekXMPP processes these stanzas. -- t = Thread(target=self.configure) -- t.setDaemon(True) -- t.start() -+ self.configure() - self._bot.callback_room_joined(self) - log.info('Joined room %s.', room) - -@@ -137,7 +131,7 @@ def leave(self, reason=None): - reason = "" - room = str(self) - try: -- self.xep0045.leaveMUC(room=room, nick=self.xep0045.ourNicks[room], msg=reason) -+ self.xep0045.leave_muc(room=room, nick=self.xep0045.ourNicks[room], msg=reason) - - self._bot.conn.del_event_handler(f'muc::{room}::got_online', self._bot.user_joined_chat) - self._bot.conn.del_event_handler(f'muc::{room}::got_offline', self._bot.user_left_chat) -@@ -148,7 +142,7 @@ def leave(self, reason=None): - - def create(self): - """ -- Not supported on this back-end (SleekXMPP doesn't support it). -+ Not supported on this back-end (Slixmpp doesn't support it). - Will join the room to ensure it exists, instead. - """ - logging.warning( -@@ -186,7 +180,7 @@ def joined(self): - :getter: - Returns `True` if the room has been joined, `False` otherwise. - """ -- return str(self) in self.xep0045.getJoinedRooms() -+ return str(self) in self.xep0045.get_joined_rooms() - - @property - def topic(self): -@@ -214,7 +208,7 @@ def topic(self, topic): - :param topic: - The topic to set. - """ -- # Not supported by SleekXMPP at the moment :( -+ # Not supported by Slixmpp at the moment :( - raise NotImplementedError("Setting the topic is not supported on this back-end.") - - @property -@@ -261,16 +255,16 @@ def configure(self): - affiliation = None - while affiliation is None: - sleep(0.5) -- affiliation = self.xep0045.getJidProperty( -+ affiliation = self.xep0045.get_jid_property( - room=room, -- nick=self.xep0045.ourNicks[room], -- jidProperty='affiliation' -+ nick=self.xep0045.our_nicks[room], -+ jid_property='affiliation' - ) - - if affiliation == "owner": - log.debug('Configuring room %s: we have owner affiliation.', room) -- form = self.xep0045.getRoomConfig(room) -- self.xep0045.configureRoom(room, form) -+ form = yield from self.xep0045.get_room_config(room) -+ self.xep0045.configure_room(room, form) - else: - log.debug("Not configuring room %s: we don't have owner affiliation (affiliation=%s)", room, affiliation) - -@@ -291,7 +285,7 @@ def real_jid(self): - Will only work if the errbot is moderator in the MUC or it is not anonymous. - """ - room_jid = self._node + '@' + self._domain -- jid = JID(self._room.xep0045.getJidProperty(room_jid, self.resource, 'jid')) -+ jid = JID(self._room.xep0045.get_jid_property(room_jid, self.resource, 'jid')) - return jid.bare - - @property -@@ -303,7 +297,8 @@ def room(self): - - class XMPPConnection(object): - def __init__(self, jid, password, feature=None, keepalive=None, -- ca_cert=None, server=None, use_ipv6=None, bot=None): -+ ca_cert=None, server=None, use_ipv6=None, bot=None, -+ ssl_version=None): - if feature is None: - feature = {} - self._bot = bot -@@ -317,7 +312,7 @@ def __init__(self, jid, password, feature=None, keepalive=None, - self.client.register_plugin('xep_0249') # XMPP direct MUC invites - - if keepalive is not None: -- self.client.whitespace_keepalive = True # Just in case SleekXMPP's default changes to False in the future -+ self.client.whitespace_keepalive = True # Just in case Slixmpp's default changes to False in the future - self.client.whitespace_keepalive_interval = keepalive - - if use_ipv6 is not None: -@@ -348,7 +343,7 @@ def disconnect(self): - self.connected = False - - def serve_forever(self): -- self.client.process(block=True) -+ self.client.process() - - def add_event_handler(self, name, cb): - self.client.add_event_handler(name, cb) -@@ -447,7 +442,7 @@ def incoming_message(self, xmppmsg): - msg.to = self._build_person(xmppmsg['to'].full) - - msg.nick = xmppmsg['mucnick'] -- msg.delayed = bool(xmppmsg['delay']._get_attr('stamp')) # this is a bug in sleekxmpp it should be ['from'] -+ msg.delayed = bool(xmppmsg['delay']._get_attr('stamp')) # this is a bug in slixmpp it should be ['from'] - self.callback_message(msg) - - def _idd_from_event(self, event): -@@ -582,7 +577,7 @@ def rooms(self): - A list of :class:`~errbot.backends.base.XMPPMUCRoom` instances. - """ - xep0045 = self.conn.client.plugin['xep_0045'] -- return [XMPPRoom(room, self) for room in xep0045.getJoinedRooms()] -+ return [XMPPRoom(room, self) for room in xep0045.get_joined_rooms()] - - def query_room(self, room): - """ -diff --git a/setup.py b/setup.py -index 3d0c09f8..4a3c1ea1 100755 ---- a/setup.py -+++ b/setup.py -@@ -105,12 +105,12 @@ def read(fname, encoding='ascii'): - }, - extras_require={ - 'graphic': ['PySide', ], -- 'hipchat': ['hypchat', 'sleekxmpp', 'pyasn1', 'pyasn1-modules'], -+ 'hipchat': ['hypchat', 'slixmpp', 'pyasn1', 'pyasn1-modules'], - 'IRC': ['irc', ], - 'slack': ['slackclient>=1.0.5,<2.0', ], - 'slack-rtm': ['slackclient>=2.0', ], - 'telegram': ['python-telegram-bot', ], -- 'XMPP': ['sleekxmpp', 'pyasn1', 'pyasn1-modules'], -+ 'XMPP': ['slixmpp', 'pyasn1', 'pyasn1-modules'], - ':python_version<"3.7"': ['dataclasses'], # backward compatibility for 3.3->3.6 for dataclasses - ':sys_platform!="win32"': ['daemonize'], - }, diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml index abf56ae3f09c..6c33b0c08be1 100644 --- a/net-im/err/metadata.xml +++ b/net-im/err/metadata.xml @@ -2,6 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <stabilize-allarches/> <use> <flag name="irc">Pull optional dependencies, needed for IRC backend</flag> </use> diff --git a/net-im/skype-dbus-mock/metadata.xml b/net-im/skype-dbus-mock/metadata.xml index 1b2becffa26c..7a38bb900964 100644 --- a/net-im/skype-dbus-mock/metadata.xml +++ b/net-im/skype-dbus-mock/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild b/net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild index 17ee7b2353b9..10a65d6831c3 100644 --- a/net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild +++ b/net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild @@ -1,34 +1,30 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_7 ) - -inherit python-r1 +PYTHON_COMPAT=( python3_{7..9} ) +inherit python-single-r1 GIT_COMMIT="3a9e2882ac5c0ad6be3c5cb5c7da008b4cfa51da" DESCRIPTION="Mocked systemd dbus interface for skype 8.30+" HOMEPAGE="https://github.com/maelnor/skype-dbus-mock" +S="${WORKDIR}/${PN}-${GIT_COMMIT}" SRC_URI="https://github.com/maelnor/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND} +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/dbus-python[${PYTHON_USEDEP}]') >=net-im/skypeforlinux-8.30 - dev-python/dbus-python[${PYTHON_USEDEP}] !sys-apps/systemd !sys-auth/elogind" -S=${WORKDIR}/${PN}-${GIT_COMMIT} - src_install() { - newbin skype-dbus-mock.py skype-dbus-mock + python_doscript skype-dbus-mock.py insinto /usr/share/dbus-1/system-services doins org.freedesktop.login1.service insinto /usr/share/dbus-1/system.d diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest index ec19f7578ef3..863cbcd269de 100644 --- a/net-irc/limnoria/Manifest +++ b/net-irc/limnoria/Manifest @@ -1 +1 @@ -DIST limnoria-20191123.tar.gz 975077 BLAKE2B b5bc425013a30043c79a5dc53fc346e3b65cafbae154789f43634fc8beb4c7dcfaea34b0c1e22eae28e044eaa2801b0c29ef106fd6e2cc0095e6acbf4c4bf931 SHA512 5822f83a5d7fae0e45e526d9a72c1bbfd2acb7f625cff38e4d6e59222aca4c68204ae03069e991e274b108391cd4feff85783805657554771a7d24789589d14b +DIST limnoria-20200124.tar.gz 1034653 BLAKE2B 895a0820efcd58429e457e0cb8dbcb864e56a3bce9fab9546cf622aabc7711a015432812c4193d2dabe7a85043c623ce427504c1c8e78530499c8db2c589bd8e SHA512 828c4927e2ce00c012d17f8a2b2d629370c34915e7e4f71de6df67259e643448c33a60d9cf742b2d827e21e17326a8fc20be875eac826edf64406eda906567a4 diff --git a/net-irc/limnoria/limnoria-20191123.ebuild b/net-irc/limnoria/limnoria-20200124.ebuild index 9374199261b8..e4accb140ca5 100644 --- a/net-irc/limnoria/limnoria-20191123.ebuild +++ b/net-irc/limnoria/limnoria-20200124.ebuild @@ -1,34 +1,36 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_7 ) +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}" MY_PN="Limnoria" MY_P="${MY_PN}-${MY_PV}" -if [[ ${PV} == "99999999" ]]; then +if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/ProgVal/${MY_PN}.git" EGIT_BRANCH="testing" inherit git-r3 - SRC_URI="" else SRC_URI="https://github.com/ProgVal/${MY_PN}/archive/master-${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-master-${MY_PV}" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Python based extensible IRC infobot and channel bot" -HOMEPAGE="https://supybot.aperio.fr/" -LICENSE="BSD" +HOMEPAGE="https://docs.limnoria.net" +LICENSE="BSD GPL-2+" SLOT="0" -IUSE="crypt ssl" +IUSE="crypt ssl test" +RESTRICT=" !test? ( test )" RDEPEND=" dev-python/chardet[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] dev-python/ecdsa[${PYTHON_USEDEP}] dev-python/feedparser[${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] @@ -38,43 +40,34 @@ RDEPEND=" crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) !net-irc/supybot - !net-irc/supybot-plugins - " -DEPEND="${RDEPEND}" - -src_unpack() { - if [[ ${PV} == "99999999" ]]; then - git-r3_src_unpack - else - unpack ${P}.tar.gz - fi -} + !net-irc/supybot-plugins" +BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )" python_prepare() { einfo "Removing the RSS plugin because of clashes between libxml2's Python3" einfo "bindings and feedparser." - rm -rf "plugins/RSS" || die -} - -python_install_all() { - distutils-r1_python_install_all - doman man/* + rm -r "plugins/RSS" || die } python_test() { - pushd "${T}" > /dev/null - PLUGINS_DIR="${BUILD_DIR}/lib/supybot/plugins" + pushd "${T}" > /dev/null || die + PLUGINS_DIR="${BUILD_DIR}"/lib/supybot/plugins EXCLUDE_PLUGINS=() # intermittent failure due to issues loading libsandbox.so from LD_PRELOAD # runs successfully when running the tests on the installed system EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Unix" ) # Runs despite --no-network (GH #1392) EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Aka" ) - "${PYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \ + "${EPYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \ --plugins-dir="${PLUGINS_DIR}" --no-network \ --disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \ || die "Tests failed under ${EPYTHON}" - popd > /dev/null + popd > /dev/null || die +} + +python_install_all() { + distutils-r1_python_install_all + doman man/* } pkg_postinst() { diff --git a/net-irc/limnoria/limnoria-99999999.ebuild b/net-irc/limnoria/limnoria-9999.ebuild index 9374199261b8..e4accb140ca5 100644 --- a/net-irc/limnoria/limnoria-99999999.ebuild +++ b/net-irc/limnoria/limnoria-9999.ebuild @@ -1,34 +1,36 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_7 ) +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}" MY_PN="Limnoria" MY_P="${MY_PN}-${MY_PV}" -if [[ ${PV} == "99999999" ]]; then +if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/ProgVal/${MY_PN}.git" EGIT_BRANCH="testing" inherit git-r3 - SRC_URI="" else SRC_URI="https://github.com/ProgVal/${MY_PN}/archive/master-${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-master-${MY_PV}" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Python based extensible IRC infobot and channel bot" -HOMEPAGE="https://supybot.aperio.fr/" -LICENSE="BSD" +HOMEPAGE="https://docs.limnoria.net" +LICENSE="BSD GPL-2+" SLOT="0" -IUSE="crypt ssl" +IUSE="crypt ssl test" +RESTRICT=" !test? ( test )" RDEPEND=" dev-python/chardet[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] dev-python/ecdsa[${PYTHON_USEDEP}] dev-python/feedparser[${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] @@ -38,43 +40,34 @@ RDEPEND=" crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) !net-irc/supybot - !net-irc/supybot-plugins - " -DEPEND="${RDEPEND}" - -src_unpack() { - if [[ ${PV} == "99999999" ]]; then - git-r3_src_unpack - else - unpack ${P}.tar.gz - fi -} + !net-irc/supybot-plugins" +BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )" python_prepare() { einfo "Removing the RSS plugin because of clashes between libxml2's Python3" einfo "bindings and feedparser." - rm -rf "plugins/RSS" || die -} - -python_install_all() { - distutils-r1_python_install_all - doman man/* + rm -r "plugins/RSS" || die } python_test() { - pushd "${T}" > /dev/null - PLUGINS_DIR="${BUILD_DIR}/lib/supybot/plugins" + pushd "${T}" > /dev/null || die + PLUGINS_DIR="${BUILD_DIR}"/lib/supybot/plugins EXCLUDE_PLUGINS=() # intermittent failure due to issues loading libsandbox.so from LD_PRELOAD # runs successfully when running the tests on the installed system EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Unix" ) # Runs despite --no-network (GH #1392) EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Aka" ) - "${PYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \ + "${EPYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \ --plugins-dir="${PLUGINS_DIR}" --no-network \ --disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \ || die "Tests failed under ${EPYTHON}" - popd > /dev/null + popd > /dev/null || die +} + +python_install_all() { + distutils-r1_python_install_all + doman man/* } pkg_postinst() { diff --git a/net-irc/limnoria/metadata.xml b/net-irc/limnoria/metadata.xml index 7d0ba75439c3..05291b97d3d0 100644 --- a/net-irc/limnoria/metadata.xml +++ b/net-irc/limnoria/metadata.xml @@ -5,6 +5,7 @@ <email>NP-Hardass@gentoo.org</email> <name>NP-Hardass</name> </maintainer> + <stabilize-allarches/> <use> <flag name="crypt">Enables user authentication with GPG</flag> </use> diff --git a/net-misc/pyhoca-cli/Manifest b/net-misc/pyhoca-cli/Manifest index 8f70aca19023..5d6dd9b07e1a 100644 --- a/net-misc/pyhoca-cli/Manifest +++ b/net-misc/pyhoca-cli/Manifest @@ -1,2 +1 @@ -DIST pyhoca-cli-0.6.1.1.tar.gz 41893 BLAKE2B 39f695224c64dacf0f2efa449ff3e235f22571647e77dd58ed031a0899991337af8deff5808293b4f1e1932a47dbd7af63ab6b86b1c5373122f4678eefec168a SHA512 b83e584f314df936d09cda25b253bbd5f37aa7f57db084424b2696070963a99776284c827f602321329bd066c6f483f32cd3dd0aa961eea7c79aa217949966c7 DIST pyhoca-cli-0.6.1.2.tar.gz 41891 BLAKE2B a3183acc8b4a809e5b3894bbcb276972f3bf0178f2a9f596e697866db4217ca4e04d6b3d698b202e124a2e42a3b1f9b2f0fbd595bf0483f55dd7dbe9ea108ef3 SHA512 02bb6a0dcb72bc67e8b8109e554f04fa57d5b2da2682b50a081b60e19c257842ae31aabb7faa945579fb23d0e922befd0678c413b31393d368b4173e0d4315f6 diff --git a/net-misc/pyhoca-cli/metadata.xml b/net-misc/pyhoca-cli/metadata.xml index fa439d9e97ee..4a4d62e56a75 100644 --- a/net-misc/pyhoca-cli/metadata.xml +++ b/net-misc/pyhoca-cli/metadata.xml @@ -5,6 +5,7 @@ <email>voyageur@gentoo.org</email> <name>Bernard Cafarelli</name> </maintainer> + <stabilize-allarches/> <longdescription> PyHoca-CLI is a client implementation for X2Go using the project's Python API (Python module). PyHoca-CLI can be operated completely from the command line and the goal is to reflect the full functionality spectrum of Python X2Go. </longdescription> diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.1.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.1.ebuild deleted file mode 100644 index 3f2ee6193450..000000000000 --- a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_7 ) -inherit distutils-r1 - -DESCRIPTION="X2Go command line client" -HOMEPAGE="http://www.x2go.org" -SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="dev-python/setproctitle[${PYTHON_USEDEP}] - >=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -python_install() { - distutils-r1_python_install - python_doscript ${PN} -} - -python_install_all() { - distutils-r1_python_install_all - doman man/man1/* - find "${ED}" -name '*.pth' -delete || die -} diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild index 3f2ee6193450..107198b5c85b 100644 --- a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild +++ b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild @@ -3,21 +3,26 @@ EAPI=7 -PYTHON_COMPAT=( python3_7 ) +PYTHON_COMPAT=( python3_{7..9} ) inherit distutils-r1 DESCRIPTION="X2Go command line client" HOMEPAGE="http://www.x2go.org" SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" -LICENSE="AGPL-3" +LICENSE="AGPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="dev-python/setproctitle[${PYTHON_USEDEP}] +RDEPEND=" + dev-python/setproctitle[${PYTHON_USEDEP}] >=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" + +python_prepare_all() { + # we don't need setuptools at runtime + sed -i -e '/install_requires/d' setup.py || die + distutils-r1_python_prepare_all +} python_install() { distutils-r1_python_install diff --git a/net-misc/pyhoca-gui/Manifest b/net-misc/pyhoca-gui/Manifest index 6e474411035a..00ef21627149 100644 --- a/net-misc/pyhoca-gui/Manifest +++ b/net-misc/pyhoca-gui/Manifest @@ -1,2 +1 @@ -DIST pyhoca-gui-0.6.1.0.tar.gz 2098973 BLAKE2B fdd145bb8ba67d70571a2244bded2f5c30382725c21747778c7490a98cd85dd7e872aec9ba539d407764a9a3a38d590aed5742268ebc38aa9cfaa3fc5b5a679c SHA512 d2730aa52afd4a835e593f3d8bde84435abb67aa490bb05807353d8d102c1d85564c21decbaf04e5cf54ef4a376247cf4a5ba1f7c9baf96149dbea9e583ea9cb DIST pyhoca-gui-0.6.1.1.tar.gz 2099727 BLAKE2B 944ee3cd743d502ce320759b9200c74de13802e23aabc2a5fe5659e123e2bbc368bf8a216c73de2c2ed22408d8fe50b4b945cc0714d05e1cb0faa1e5617dd4b0 SHA512 e7e24d60c1e4ecca2201c2a25bfc8c5552e54e30a5f744c5bc9c36ba4050a64cbb8616ab2e035b34cd14c62702ff88e32c863cac8aef0f8f4cb18db1d2e737b6 diff --git a/net-misc/pyhoca-gui/metadata.xml b/net-misc/pyhoca-gui/metadata.xml index b87a98e44d52..e24d4d041e88 100644 --- a/net-misc/pyhoca-gui/metadata.xml +++ b/net-misc/pyhoca-gui/metadata.xml @@ -5,6 +5,7 @@ <email>voyageur@gentoo.org</email> <name>Bernard Cafarelli</name> </maintainer> + <stabilize-allarches/> <longdescription> PyHoca-GUI is a client implementation for X2Go using the project's Python X2Go client API (a Python module). PyHoca-GUI uses wxPython for rendering graphical desktop elements (menus, dialog boxes etc.). diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.0.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.0.ebuild deleted file mode 100644 index 3d05ef2fc367..000000000000 --- a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_7 ) -inherit distutils-r1 - -DESCRIPTION="X2Go graphical client applet" -HOMEPAGE="http://www.x2go.org" -SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-python/pycups[${PYTHON_USEDEP}] - dev-python/setproctitle[${PYTHON_USEDEP}] - dev-python/wxpython[${PYTHON_USEDEP}] - >=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}] - x11-libs/libnotify" -DEPEND="${DEPEND} - dev-python/python-distutils-extra[${PYTHON_USEDEP}]" - -python_install() { - distutils-r1_python_install - python_doscript ${PN} -} - -python_install_all() { - distutils-r1_python_install_all - doman man/man1/* - find "${ED}" -name '*.pth' -delete || die -} diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild index 3d05ef2fc367..671e506e1ffe 100644 --- a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild +++ b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild @@ -1,27 +1,32 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_7 ) +PYTHON_COMPAT=( python3_{7..9} ) inherit distutils-r1 DESCRIPTION="X2Go graphical client applet" HOMEPAGE="http://www.x2go.org" SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" -LICENSE="AGPL-3" +LICENSE="AGPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-python/pycups[${PYTHON_USEDEP}] +RDEPEND=" + dev-python/pycups[${PYTHON_USEDEP}] dev-python/setproctitle[${PYTHON_USEDEP}] dev-python/wxpython[${PYTHON_USEDEP}] >=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}] x11-libs/libnotify" -DEPEND="${DEPEND} - dev-python/python-distutils-extra[${PYTHON_USEDEP}]" +BDEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]" + +python_prepare_all() { + # we don't need setuptools at runtime + sed -i -e '/install_requires/d' setup.py || die + distutils-r1_python_prepare_all +} python_install() { distutils-r1_python_install diff --git a/sys-devel/gcc-config/gcc-config-2.3.3.ebuild b/sys-devel/gcc-config/gcc-config-2.3.3.ebuild index 33b842037c49..dc35f1d98a2a 100644 --- a/sys-devel/gcc-config/gcc-config-2.3.3.ebuild +++ b/sys-devel/gcc-config/gcc-config-2.3.3.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="Utility to manage compilers" diff --git a/sys-libs/timezone-data/timezone-data-2021a.ebuild b/sys-libs/timezone-data/timezone-data-2021a.ebuild index 430415744f33..21d281593811 100644 --- a/sys-libs/timezone-data/timezone-data-2021a.ebuild +++ b/sys-libs/timezone-data/timezone-data-2021a.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t LICENSE="BSD public-domain" 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="nls leaps-timezone elibc_FreeBSD zic-slim" DEPEND="nls? ( virtual/libintl )" diff --git a/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild b/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild index 93d97c5760f9..bcf7ef211875 100644 --- a/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild +++ b/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl" RDEPEND=" |