commit: 3e6673d44728fab2a2810c0bb594594bee40ccfe Author: Leonardo Hernández Hernández <leohdz172 <AT> proton <DOT> me> AuthorDate: Fri Jul 21 01:55:19 2023 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Wed Aug 16 22:06:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e6673d4
net-vpn/ovpn-dco: migrate to linux-mod-r1.eclass Closes: https://bugs.gentoo.org/908718 Closes: https://github.com/gentoo/gentoo/pull/31984 Signed-off-by: William Hubbs <williamh <AT> gentoo.org> net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild | 19 +++++++++---------- net-vpn/ovpn-dco/ovpn-dco-9999.ebuild | 19 +++++++++---------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild b/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild index bdbf08846d5c..b98d189c7b99 100644 --- a/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild +++ b/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic linux-mod +inherit flag-o-matic linux-mod-r1 DESCRIPTION="OpenVPN Data Channel Offload in the linux kernel" HOMEPAGE="https://github.com/OpenVPN/ovpn-dco"; @@ -20,9 +20,6 @@ LICENSE="GPL-2" SLOT="0" IUSE="debug" -MODULE_NAMES="ovpn-dco-v2(updates:.:drivers/net/ovpn-dco)" -BUILD_TARGETS="all" - pkg_setup() { CONFIG_CHECK=" INET @@ -34,7 +31,7 @@ pkg_setup() { CRYPTO_GCM CRYPTO_CHACHA20POLY1305" - linux-mod_pkg_setup + linux-mod-r1_pkg_setup } src_configure() { @@ -45,14 +42,16 @@ src_configure() { } src_compile() { - BUILD_PARAMS+=" KERNEL_SRC='${KERNEL_DIR}'" - [[ ${PV} != 9999 ]] && BUILD_PARAMS+=" REVISION='${PV}'" - use debug && BUILD_PARAMS+=" DEBUG=1" - linux-mod_src_compile + local modlist=( "ovpn-dco-v2=updates:.:drivers/net/ovpn-dco" ) + local modargs=( KERNEL_SRC="${KERNEL_DIR}" ) + [[ ${PV} != 9999 ]] && modargs+=( REVISION="${PV}" ) + use debug && modargs+=( DEBUG=1 ) + + linux-mod-r1_src_compile } src_install() { - linux-mod_src_install + linux-mod-r1_src_install insinto /usr/share/${PN} doins -r include diff --git a/net-vpn/ovpn-dco/ovpn-dco-9999.ebuild b/net-vpn/ovpn-dco/ovpn-dco-9999.ebuild index 074eb2f33488..3d07f86aeabc 100644 --- a/net-vpn/ovpn-dco/ovpn-dco-9999.ebuild +++ b/net-vpn/ovpn-dco/ovpn-dco-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic linux-mod +inherit flag-o-matic linux-mod-r1 DESCRIPTION="OpenVPN Data Channel Offload in the linux kernel" HOMEPAGE="https://github.com/OpenVPN/ovpn-dco"; @@ -20,9 +20,6 @@ LICENSE="GPL-2" SLOT="0" IUSE="debug" -MODULE_NAMES="ovpn-dco-v2(updates:.:drivers/net/ovpn-dco)" -BUILD_TARGETS="all" - pkg_setup() { CONFIG_CHECK=" INET @@ -34,7 +31,7 @@ pkg_setup() { CRYPTO_GCM CRYPTO_CHACHA20POLY1305" - linux-mod_pkg_setup + linux-mod-r1_pkg_setup } src_configure() { @@ -45,14 +42,16 @@ src_configure() { } src_compile() { - BUILD_PARAMS+=" KERNEL_SRC='${KERNEL_DIR}'" - [[ ${PV} != 9999 ]] && BUILD_PARAMS+=" REVISION='${PV}'" - use debug && BUILD_PARAMS+=" DEBUG=1" - linux-mod_src_compile + local modlist=( "ovpn-dco-v2=updates:.:drivers/net/ovpn-dco" ) + local modargs=( KERNEL_SRC="${KERNEL_DIR}" ) + [[ ${PV} != 9999 ]] && modargs+=( REVISION="${PV}" ) + use debug && modargs+=( DEBUG=1 ) + + linux-mod-r1_src_compile } src_install() { - linux-mod_src_install + linux-mod-r1_src_install insinto /usr/share/${PN} doins -r include
