commit: 80ef1c05eaf312a05e91c56acd56b20464eed81e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jun 16 15:29:03 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 16 15:29:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ef1c05
sys-apps/kmod: enable zstd support by default And depends on newer zstd w/ split-usr support. Portage already depends on app-arch/zstd so this doesn't extend @system at all. Closes: https://bugs.gentoo.org/771078 Signed-off-by: Sam James <sam <AT> gentoo.org> .../kmod/{kmod-9999.ebuild => kmod-29-r1.ebuild} | 21 +++++++++++---------- sys-apps/kmod/kmod-9999.ebuild | 21 +++++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-29-r1.ebuild similarity index 90% copy from sys-apps/kmod/kmod-9999.ebuild copy to sys-apps/kmod/kmod-29-r1.ebuild index c18aedb0e8f6..e500c5c7fb00 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-29-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit autotools bash-completion-r1 multilib python-r1 @@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" #inherit libtool fi @@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd" +IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd" # Upstream does not support running the test suite with custom configure flags. # I was also told that the test suite is intended for kmod developers. @@ -29,17 +29,18 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd" # See bug #408915. RESTRICT="test" -# >=zlib-1.2.6 required because of bug #427130 -# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +# - >=zlib-1.2.6 required because of bug #427130 +# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +# - >=zstd-1.5.1-r3 required for bug #771078 RDEPEND="!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( ${PYTHON_DEPS} ) - pkcs7? ( >=dev-libs/openssl-1.1.0:0= ) + pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) - zstd? ( >=app-arch/zstd-1.4.4 )" + zstd? ( >=app-arch/zstd-1.5.1-r3:= )" DEPEND="${RDEPEND}" BDEPEND=" doc? ( @@ -50,7 +51,7 @@ BDEPEND=" python? ( dev-python/cython[${PYTHON_USEDEP}] virtual/pkgconfig - ) + ) zlib? ( virtual/pkgconfig ) " if [[ ${PV} == 9999* ]]; then diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index c18aedb0e8f6..e500c5c7fb00 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit autotools bash-completion-r1 multilib python-r1 @@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" #inherit libtool fi @@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd" +IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd" # Upstream does not support running the test suite with custom configure flags. # I was also told that the test suite is intended for kmod developers. @@ -29,17 +29,18 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd" # See bug #408915. RESTRICT="test" -# >=zlib-1.2.6 required because of bug #427130 -# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +# - >=zlib-1.2.6 required because of bug #427130 +# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +# - >=zstd-1.5.1-r3 required for bug #771078 RDEPEND="!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( ${PYTHON_DEPS} ) - pkcs7? ( >=dev-libs/openssl-1.1.0:0= ) + pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) - zstd? ( >=app-arch/zstd-1.4.4 )" + zstd? ( >=app-arch/zstd-1.5.1-r3:= )" DEPEND="${RDEPEND}" BDEPEND=" doc? ( @@ -50,7 +51,7 @@ BDEPEND=" python? ( dev-python/cython[${PYTHON_USEDEP}] virtual/pkgconfig - ) + ) zlib? ( virtual/pkgconfig ) " if [[ ${PV} == 9999* ]]; then
