Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-text/aha/aha-0.5.1.ebuild2
-rw-r--r--dev-python/configshell-fb/configshell-fb-1.1.29.ebuild2
-rw-r--r--dev-python/jaraco-text/jaraco-text-3.9.1.ebuild2
-rw-r--r--dev-python/pathlib2/pathlib2-2.3.7_p1.ebuild2
-rw-r--r--dev-python/pyudev/pyudev-0.24.0.ebuild2
-rw-r--r--dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild2
-rw-r--r--dev-python/urwid/urwid-2.1.2-r1.ebuild2
-rw-r--r--eclass/distutils-r1.eclass94
-rw-r--r--profiles/arch/loong/package.use.mask4
-rw-r--r--sys-apps/merge-usr/merge-usr-1.ebuild2
-rw-r--r--sys-block/targetcli-fb/targetcli-fb-2.1.54.ebuild2
11 files changed, 47 insertions, 69 deletions
diff --git a/app-text/aha/aha-0.5.1.ebuild b/app-text/aha/aha-0.5.1.ebuild
index f8096fd528c7..78b71d00245a 100644
--- a/app-text/aha/aha-0.5.1.ebuild
+++ b/app-text/aha/aha-0.5.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/theZiz/aha/archive/refs/tags/${PV}.tar.gz -> ${P}.ta
LICENSE="LGPL-2+ MPL-1.1"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv"
PATCHES=(
"${FILESDIR}/${P}-null-ptr-dereference-fix.patch"
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.29.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.29.ebuild
index ee95cd05c292..2dd852f1a636 100644
--- a/dev-python/configshell-fb/configshell-fb-1.1.29.ebuild
+++ b/dev-python/configshell-fb/configshell-fb-1.1.29.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-text/jaraco-text-3.9.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.9.1.ebuild
index 628911f323df..8c1cfbc650dd 100644
--- a/dev-python/jaraco-text/jaraco-text-3.9.1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.9.1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
RDEPEND="
>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/pathlib2/pathlib2-2.3.7_p1.ebuild b/dev-python/pathlib2/pathlib2-2.3.7_p1.ebuild
index 9fffbbfd1f96..6a9a5a84636c 100644
--- a/dev-python/pathlib2/pathlib2-2.3.7_p1.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.7_p1.ebuild
@@ -23,6 +23,6 @@ S=${WORKDIR}/${MY_P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
distutils_enable_tests pytest
diff --git a/dev-python/pyudev/pyudev-0.24.0.ebuild b/dev-python/pyudev/pyudev-0.24.0.ebuild
index 00bd94e9adcc..75e69f94225b 100644
--- a/dev-python/pyudev/pyudev-0.24.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.24.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
IUSE="qt5"
# Known to fail on test system that aren't exactly the same devices as on CI
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
index 0b3f59980cbf..1f416f24fd14 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="dev-python/pyudev[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/urwid/urwid-2.1.2-r1.ebuild b/dev-python/urwid/urwid-2.1.2-r1.ebuild
index e8f4f3e0bfba..9b8e88d7a387 100644
--- a/dev-python/urwid/urwid-2.1.2-r1.ebuild
+++ b/dev-python/urwid/urwid-2.1.2-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples"
distutils_enable_sphinx docs
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 60f81473c0a6..4cc117dfbd54 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -150,9 +150,6 @@ esac
#
# - rdepend -- add it to BDEPEND+RDEPEND (e.g. when using pkg_resources)
#
-# - pyproject.toml -- use pyproject2setuptools to install a project
-# using pyproject.toml (flit, poetry...)
-#
# - manual -- do not add the dependency and suppress the checks
# (assumes you will take care of doing it correctly)
#
@@ -205,7 +202,7 @@ _distutils_set_globals() {
fi
bdep='
- >=dev-python/gpep517-8[${PYTHON_USEDEP}]
+ >=dev-python/gpep517-9[${PYTHON_USEDEP}]
'
case ${DISTUTILS_USE_PEP517} in
flit)
@@ -215,22 +212,22 @@ _distutils_set_globals() {
;;
flit_scm)
bdep+='
- dev-python/flit_scm[${PYTHON_USEDEP}]
+ >=dev-python/flit_scm-1.7.0[${PYTHON_USEDEP}]
'
;;
hatchling)
bdep+='
- >=dev-python/hatchling-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/hatchling-1.8.1[${PYTHON_USEDEP}]
'
;;
jupyter)
bdep+='
- >=dev-python/jupyter_packaging-0.12.0-r1[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_packaging-0.12.3[${PYTHON_USEDEP}]
'
;;
maturin)
bdep+='
- >=dev-util/maturin-0.12.20[${PYTHON_USEDEP}]
+ >=dev-util/maturin-0.13.2[${PYTHON_USEDEP}]
'
;;
no)
@@ -239,27 +236,27 @@ _distutils_set_globals() {
;;
meson-python)
bdep+='
- dev-python/meson-python[${PYTHON_USEDEP}]
+ >=dev-python/meson-python-0.9.0[${PYTHON_USEDEP}]
'
;;
pbr)
bdep+='
- >=dev-python/pbr-5.9.0[${PYTHON_USEDEP}]
+ >=dev-python/pbr-5.10.0[${PYTHON_USEDEP}]
'
;;
pdm)
bdep+='
- >=dev-python/pdm-pep517-1.0.2[${PYTHON_USEDEP}]
+ >=dev-python/pdm-pep517-1.0.4[${PYTHON_USEDEP}]
'
;;
poetry)
bdep+='
- >=dev-python/poetry-core-1.0.8[${PYTHON_USEDEP}]
+ >=dev-python/poetry-core-1.2.0[${PYTHON_USEDEP}]
'
;;
setuptools)
bdep+='
- >=dev-python/setuptools-62.6.0[${PYTHON_USEDEP}]
+ >=dev-python/setuptools-65.3.0[${PYTHON_USEDEP}]
dev-python/wheel[${PYTHON_USEDEP}]
'
;;
@@ -280,7 +277,7 @@ _distutils_set_globals() {
eqawarn "is enabled."
fi
else
- local setuptools_dep='>=dev-python/setuptools-42.0.2[${PYTHON_USEDEP}]'
+ local setuptools_dep='>=dev-python/setuptools-65.3.0[${PYTHON_USEDEP}]'
case ${DISTUTILS_USE_SETUPTOOLS:-bdepend} in
no|manual)
@@ -293,7 +290,7 @@ _distutils_set_globals() {
rdep+=" ${setuptools_dep}"
;;
pyproject.toml)
- bdep+=' >=dev-python/pyproject2setuppy-22[${PYTHON_USEDEP}]'
+ die "DISTUTILS_USE_SETUPTOOLS=pyproject.toml is no longer supported, use DISTUTILS_USE_PEP517"
;;
*)
die "Invalid DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}"
@@ -600,7 +597,7 @@ distutils_enable_tests() {
test_pkg=">=dev-python/nose-1.3.7_p20211111_p1-r1"
;;
pytest)
- test_pkg=">=dev-python/pytest-7.1.2"
+ test_pkg=">=dev-python/pytest-7.1.3"
;;
setup.py)
;;
@@ -668,9 +665,7 @@ esetup.py() {
fi
local setup_py=( setup.py )
- if [[ ${DISTUTILS_USE_SETUPTOOLS} == pyproject.toml ]]; then
- setup_py=( -m pyproject2setuppy )
- elif [[ ! -f setup.py ]]; then
+ if [[ ! -f setup.py ]]; then
if [[ ! -f setup.cfg ]]; then
die "${FUNCNAME}: setup.py nor setup.cfg not found"
fi
@@ -728,8 +723,8 @@ esetup.py() {
# to unmerge the package first.
#
# This function is not available in PEP517 mode. The eclass provides
-# a venv-style install unconditionally therefore, and therefore it
-# should no longer be necessary.
+# a venv-style install unconditionally and therefore it should no longer
+# be necessary.
distutils_install_for_testing() {
debug-print-function ${FUNCNAME} "${@}"
@@ -883,12 +878,10 @@ _distutils-r1_handle_pyproject_toml() {
[[ ${DISTUTILS_USE_SETUPTOOLS} == manual ]] && return
if [[ ! -f setup.py && -f pyproject.toml ]]; then
- if [[ ${DISTUTILS_USE_SETUPTOOLS} != pyproject.toml ]]; then
- eerror "No setup.py found but pyproject.toml is present. Please migrate"
- eerror "the package to use DISTUTILS_USE_PEP517. See:"
- eerror " https://projects.gentoo.org/python/guide/distutils.html"
- die "No setup.py found and PEP517 mode not enabled"
- fi
+ eerror "No setup.py found but pyproject.toml is present. Please migrate"
+ eerror "the package to use DISTUTILS_USE_PEP517. See:"
+ eerror " https://projects.gentoo.org/python/guide/distutils.html"
+ die "No setup.py found and PEP517 mode not enabled"
fi
}
@@ -1454,22 +1447,13 @@ distutils-r1_python_compile() {
fi
;;
maturin)
- if has_version '>=dev-util/maturin-0.13'; then
- # auditwheel may auto-bundle libraries (bug #831171),
- # also support cargo.eclass' IUSE=debug if available
- local -x MATURIN_PEP517_ARGS="
- --jobs=$(makeopts_jobs)
- --skip-auditwheel
- $(in_iuse debug && usex debug --profile=dev '')
- "
- else
- # legacy support, can cleanup when depend on >=0.13
- local -x MATURIN_PEP517_ARGS="
- --skip-auditwheel
- $(in_iuse debug && usex debug \
- --cargo-extra-args=--profile=dev '')
- "
- fi
+ # auditwheel may auto-bundle libraries (bug #831171),
+ # also support cargo.eclass' IUSE=debug if available
+ local -x MATURIN_PEP517_ARGS="
+ --jobs=$(makeopts_jobs)
+ --skip-auditwheel
+ $(in_iuse debug && usex debug --profile=dev '')
+ "
;;
no)
return
@@ -2030,21 +2014,19 @@ _distutils-r1_check_namespace_pth() {
done < <(find "${ED%/}" -name '*-nspkg.pth' -print0)
if [[ ${pth[@]} ]]; then
- ewarn "The following *-nspkg.pth files were found installed:"
- ewarn
+ eerror "The following *-nspkg.pth files were found installed:"
+ eerror
for f in "${pth[@]}"; do
- ewarn " ${f#${ED%/}}"
+ eerror " ${f#${ED%/}}"
done
- ewarn
- ewarn "The presence of those files may break namespaces in Python 3.5+. Please"
- ewarn "read our documentation on reliable handling of namespaces and update"
- ewarn "the ebuild accordingly:"
- ewarn
- ewarn " https://projects.gentoo.org/python/guide/concept.html#namespace-packages"
-
- if ! has "${EAPI}" 6 7 8; then
- die "*-nspkg.pth files are banned in EAPI ${EAPI}"
- fi
+ eerror
+ eerror "The presence of those files may break namespaces in Python 3.5+. Please"
+ eerror "read our documentation on reliable handling of namespaces and update"
+ eerror "the ebuild accordingly:"
+ eerror
+ eerror " https://projects.gentoo.org/python/guide/concept.html#namespace-packages"
+
+ die "Installing *-nspkg.pth files is banned"
fi
}
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 66299d4ac1db..466175442007 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -1,10 +1,6 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Marek Szuba <marecki@gentoo.org> (2022-10-04)
-# sys-block/targetcli-fb not keyworded here yet (Bug #866506)
-sys-libs/libblockdev test
-
# WANG Xuerui <xen0n@gentoo.org> (2022-10-04)
# Sanitizers partially supported on this architecture.
#
diff --git a/sys-apps/merge-usr/merge-usr-1.ebuild b/sys-apps/merge-usr/merge-usr-1.ebuild
index 64f9430b454a..07055e4c6985 100644
--- a/sys-apps/merge-usr/merge-usr-1.ebuild
+++ b/sys-apps/merge-usr/merge-usr-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/floppym/merge-usr/archive/refs/tags/v${PV}.tar.gz ->
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
BDEPEND="${PYTHON_DEPS}"
diff --git a/sys-block/targetcli-fb/targetcli-fb-2.1.54.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.54.ebuild
index 1e5f30d9dfd4..56bf91dcf1f4 100644
--- a/sys-block/targetcli-fb/targetcli-fb-2.1.54.ebuild
+++ b/sys-block/targetcli-fb/targetcli-fb-2.1.54.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
RDEPEND="dev-python/configshell-fb[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]