diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-01-13 10:22:02 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-01-13 10:22:02 +0000 |
commit | 82c217e2c3f36e63ecf60dc710633facfae9d574 (patch) | |
tree | 48494476a5d30834c9fac72ff99d3ec20b722476 | |
parent | 2022-01-13 09:52:26 UTC (diff) | |
parent | dev-python/ipython: adjust dep lower bounds (diff) | |
download | gentoo-82c217e2c3f36e63ecf60dc710633facfae9d574.tar.gz gentoo-82c217e2c3f36e63ecf60dc710633facfae9d574.tar.bz2 gentoo-82c217e2c3f36e63ecf60dc710633facfae9d574.zip |
Merge updates from master
-rw-r--r-- | app-admin/monit/monit-5.29.0.ebuild | 4 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.2.41.ebuild | 2 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.3.32.ebuild | 2 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.4.22.ebuild | 2 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.5.13.ebuild | 2 | ||||
-rw-r--r-- | dev-python/argon2-cffi/Manifest | 1 | ||||
-rw-r--r-- | dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild | 45 | ||||
-rw-r--r-- | dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild | 45 | ||||
-rw-r--r-- | dev-python/ipython/ipython-8.0.0.ebuild | 5 | ||||
-rw-r--r-- | dev-python/littleutils/littleutils-0.2.2.ebuild | 4 | ||||
-rw-r--r-- | dev-python/pure_eval/pure_eval-0.2.1-r1.ebuild (renamed from dev-python/pure_eval/pure_eval-0.2.1.ebuild) | 2 | ||||
-rw-r--r-- | dev-python/stack_data/stack_data-0.1.3.ebuild | 3 | ||||
-rw-r--r-- | media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild | 2 | ||||
-rw-r--r-- | media-libs/libxtract/libxtract-0.6.6.ebuild | 2 | ||||
-rw-r--r-- | media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch | 7 | ||||
-rw-r--r-- | net-misc/wget/wget-1.21.2.ebuild | 2 |
16 files changed, 24 insertions, 106 deletions
diff --git a/app-admin/monit/monit-5.29.0.ebuild b/app-admin/monit/monit-5.29.0.ebuild index 7a4e6534b1a4..8c6bc6cb5fe1 100644 --- a/app-admin/monit/monit-5.29.0.ebuild +++ b/app-admin/monit/monit-5.29.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux" IUSE="ipv6 pam ssl" RDEPEND="sys-libs/zlib:= diff --git a/dev-db/mariadb/mariadb-10.2.41.ebuild b/dev-db/mariadb/mariadb-10.2.41.ebuild index f3f2b3b57e27..f0462da46138 100644 --- a/dev-db/mariadb/mariadb-10.2.41.ebuild +++ b/dev-db/mariadb/mariadb-10.2.41.ebuild @@ -32,7 +32,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" # Shorten the path because the socket path length must be shorter than 107 chars # and we will run a mysql server during test phase diff --git a/dev-db/mariadb/mariadb-10.3.32.ebuild b/dev-db/mariadb/mariadb-10.3.32.ebuild index cd11555f93a0..fed581f1e375 100644 --- a/dev-db/mariadb/mariadb-10.3.32.ebuild +++ b/dev-db/mariadb/mariadb-10.3.32.ebuild @@ -32,7 +32,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" # Shorten the path because the socket path length must be shorter than 107 chars # and we will run a mysql server during test phase diff --git a/dev-db/mariadb/mariadb-10.4.22.ebuild b/dev-db/mariadb/mariadb-10.4.22.ebuild index 82083040b163..6a62a063bfd4 100644 --- a/dev-db/mariadb/mariadb-10.4.22.ebuild +++ b/dev-db/mariadb/mariadb-10.4.22.ebuild @@ -32,7 +32,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" # Shorten the path because the socket path length must be shorter than 107 chars # and we will run a mysql server during test phase diff --git a/dev-db/mariadb/mariadb-10.5.13.ebuild b/dev-db/mariadb/mariadb-10.5.13.ebuild index 66de9c3394eb..5d08dca8e812 100644 --- a/dev-db/mariadb/mariadb-10.5.13.ebuild +++ b/dev-db/mariadb/mariadb-10.5.13.ebuild @@ -31,7 +31,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" # Shorten the path because the socket path length must be shorter than 107 chars # and we will run a mysql server during test phase diff --git a/dev-python/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest index 4e1351bfbb5e..9e922e2ac44d 100644 --- a/dev-python/argon2-cffi/Manifest +++ b/dev-python/argon2-cffi/Manifest @@ -1,3 +1,2 @@ DIST argon2-cffi-21.1.0.tar.gz 1807800 BLAKE2B 47b1e785b7eb173b671a44e9212af76a59f453c3c0d0e5f2c437e7a62132abf86ab6baa8bdd656ad28d00a151296a66211d365c0afe228821c8c1ff1a0a66c46 SHA512 bbfebd2c075f360a6c1c187c0789be2aae7480b9398f36db7bdfe74f288d9e00b44a788918c54f4cc8bb1947136ab0493f61975de408c482a5131e2bf1a8f4d0 -DIST argon2-cffi-21.2.0.tar.gz 42399 BLAKE2B d2f1a7e7caf776239f343f5e5f2cd1fcd78f0dbdfc28814e3299df18e5c97a81cafa37bf10733614fe32ddc8d19fa5c5721285e8b96b9172eaf2322a5bb9e529 SHA512 40cdd18106d959bf58f20a35ea84ac3c3859d28ed6cfa28ee81655c12038b4e0f28bfe2d8ee9b96cd6009dfcebe0ef6aa4eb7fa9cd81cad0b32911ca723a8bdd DIST argon2-cffi-21.3.0.tar.gz 38446 BLAKE2B e0464f501efcdfbf33d93e0c1c6dbc519ad6aee06c0b8692417156de608f6c6acf947f86b866c064601fe994087677e51d954ae2c1225cbbbba3534cf70c6296 SHA512 6cb2a075f3bb7040ee7f552d082bfa2f3df0854649d9c84fdfdb42bb4bee2133b8a35a20be2b3c887931efda12fbbb00815d8d88170b7e20b3ca19c86f97057e diff --git a/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild deleted file mode 100644 index 626912c37ddf..000000000000 --- a/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -DISTUTILS_USE_SETUPTOOLS=pyproject.toml -inherit distutils-r1 - -DESCRIPTION="CFFI bindings to the Argon2 password hashing library" -HOMEPAGE="https://github.com/hynek/argon2-cffi" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]" -BDEPEND=" - <dev-python/pyproject2setuppy-22[${PYTHON_USEDEP}] - test? ( - dev-python/hypothesis[${PYTHON_USEDEP}] - ) -" - -DOCS=( AUTHORS.rst CHANGELOG.md FAQ.rst README.rst ) - -src_prepare() { - # Patch the tool.flit.module.name entry in pyproject.toml to include - # the "src" subfolder. This allows pyproject2setuppy to retrieve the - # dynamic version and description correctly. - sed -i -e 's:^name = "argon2":name = "src/argon2":' \ - "pyproject.toml" || die "Unable to patch package name" - # Sphinx's conf.py uses importlib.metadata to determine the package - # version. However, argon2-cffi is not installed when we try to build - # the docs. Therefore, we patch the release version in conf.py. - sed -i -e "/^release/s:= .*:= \"${PV}\":" \ - "docs/conf.py" || die "Unable to patch version in docs" - distutils-r1_src_prepare -} - -distutils_enable_sphinx docs \ - dev-python/furo \ - dev-python/sphinx-notfound-page -distutils_enable_tests pytest diff --git a/dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild deleted file mode 100644 index 00502332253a..000000000000 --- a/dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -DISTUTILS_USE_SETUPTOOLS=pyproject.toml -inherit distutils-r1 - -DESCRIPTION="CFFI bindings to the Argon2 password hashing library" -HOMEPAGE="https://github.com/hynek/argon2-cffi" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]" -BDEPEND=" - <dev-python/pyproject2setuppy-22[${PYTHON_USEDEP}] - test? ( - dev-python/hypothesis[${PYTHON_USEDEP}] - ) -" - -DOCS=( AUTHORS.rst FAQ.rst README.rst ) - -src_prepare() { - # Patch the tool.flit.module.name entry in pyproject.toml to include - # the "src" subfolder. This allows pyproject2setuppy to retrieve the - # dynamic version and description correctly. - sed -i -e 's:^name = "argon2":name = "src/argon2":' \ - "pyproject.toml" || die "Unable to patch package name" - # Sphinx's conf.py uses importlib.metadata to determine the package - # version. However, argon2-cffi is not installed when we try to build - # the docs. Therefore, we patch the release version in conf.py. - sed -i -e "/^release/s:= .*:= \"${PV}\":" \ - "docs/conf.py" || die "Unable to patch version in docs" - distutils-r1_src_prepare -} - -distutils_enable_sphinx docs \ - dev-python/furo \ - dev-python/sphinx-notfound-page -distutils_enable_tests pytest diff --git a/dev-python/ipython/ipython-8.0.0.ebuild b/dev-python/ipython/ipython-8.0.0.ebuild index ae999fb5d9fc..d86fd0952f68 100644 --- a/dev-python/ipython/ipython-8.0.0.ebuild +++ b/dev-python/ipython/ipython-8.0.0.ebuild @@ -28,7 +28,7 @@ RDEPEND=" >=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}] <dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] - dev-python/traitlets[${PYTHON_USEDEP}] + >=dev-python/traitlets-5.0[${PYTHON_USEDEP}] matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/matplotlib-inline[${PYTHON_USEDEP}] @@ -42,8 +42,7 @@ BDEPEND=" dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/matplotlib-inline[${PYTHON_USEDEP}] dev-python/nbformat[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - >=dev-python/numpy-1.17[${PYTHON_USEDEP}] + >=dev-python/numpy-1.19[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/stack_data[${PYTHON_USEDEP}] dev-python/testpath[${PYTHON_USEDEP}] diff --git a/dev-python/littleutils/littleutils-0.2.2.ebuild b/dev-python/littleutils/littleutils-0.2.2.ebuild index 4ad8f48f290a..0bea1124ffdd 100644 --- a/dev-python/littleutils/littleutils-0.2.2.ebuild +++ b/dev-python/littleutils/littleutils-0.2.2.ebuild @@ -14,3 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" + +python_test() { + "${EPYTHON}" -m doctest -v ${PN}/__init__.py || die "Tests fail with ${EPYTHON}" +} diff --git a/dev-python/pure_eval/pure_eval-0.2.1.ebuild b/dev-python/pure_eval/pure_eval-0.2.1-r1.ebuild index ab26ba22ca0f..0349d96ba5e6 100644 --- a/dev-python/pure_eval/pure_eval-0.2.1.ebuild +++ b/dev-python/pure_eval/pure_eval-0.2.1-r1.ebuild @@ -15,6 +15,6 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -RDEPEND="dev-python/wheel[${PYTHON_USEDEP}]" +BDEPEND="dev-python/wheel[${PYTHON_USEDEP}]" distutils_enable_tests pytest diff --git a/dev-python/stack_data/stack_data-0.1.3.ebuild b/dev-python/stack_data/stack_data-0.1.3.ebuild index 356c3415b73d..483a4209f565 100644 --- a/dev-python/stack_data/stack_data-0.1.3.ebuild +++ b/dev-python/stack_data/stack_data-0.1.3.ebuild @@ -19,8 +19,9 @@ BDEPEND="test? ( dev-python/asttokens[${PYTHON_USEDEP}] dev-python/executing[${PYTHON_USEDEP}] dev-python/typeguard[${PYTHON_USEDEP}] - dev-python/pure_eval[${PYTHON_USEDEP}] dev-python/littleutils[${PYTHON_USEDEP}] + dev-python/pure_eval[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] )" distutils_enable_tests pytest diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild index 2367e22f363f..b563dc703eb1 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild @@ -16,7 +16,7 @@ else SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi LICENSE="MIT" diff --git a/media-libs/libxtract/libxtract-0.6.6.ebuild b/media-libs/libxtract/libxtract-0.6.6.ebuild index a8c98cc33324..ff32f55c5132 100644 --- a/media-libs/libxtract/libxtract-0.6.6.ebuild +++ b/media-libs/libxtract/libxtract-0.6.6.ebuild @@ -14,7 +14,7 @@ IUSE="doc fftw" RDEPEND="fftw? ( sci-libs/fftw:3.0 )" DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-doc/doxygen[dot] )" src_configure() { econf \ diff --git a/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch b/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch index d497773aae1b..325e4cb05068 100644 --- a/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch +++ b/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch @@ -1,6 +1,11 @@ --- a/vamps/Makefile +++ b/vamps/Makefile -@@ -21,7 +21,7 @@ +@@ -17,11 +17,11 @@ + + PREFIX ?= /usr/local + +-CC = gcc ++CC ?= gcc CFLAGS ?= -O2 -g -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_REENTRANT CFLAGS += -Wall diff --git a/net-misc/wget/wget-1.21.2.ebuild b/net-misc/wget/wget-1.21.2.ebuild index 3a851a31f19b..4efdf0af08a6 100644 --- a/net-misc/wget/wget-1.21.2.ebuild +++ b/net-misc/wget/wget-1.21.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="cookie_check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib" REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" RESTRICT="!test? ( test )" |