commit:     75a8a620b0087105c1b2f132b8008a952341f8a2
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 09:50:18 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon May 29 13:03:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a8a620

games-util/xpadneo: migrate to linux-mod-r1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 ...xpadneo-9999.ebuild => xpadneo-0.9.5-r1.ebuild} | 29 +++++++++++-----------
 games-util/xpadneo/xpadneo-9999.ebuild             | 29 +++++++++++-----------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/games-util/xpadneo/xpadneo-9999.ebuild 
b/games-util/xpadneo/xpadneo-0.9.5-r1.ebuild
similarity index 78%
copy from games-util/xpadneo/xpadneo-9999.ebuild
copy to games-util/xpadneo/xpadneo-0.9.5-r1.ebuild
index b193e5517951..c1de2e3d642d 100644
--- a/games-util/xpadneo/xpadneo-9999.ebuild
+++ b/games-util/xpadneo/xpadneo-0.9.5-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-# pkgcheck note: toolchain-funcs is not unused
-inherit linux-mod toolchain-funcs udev
+inherit linux-mod-r1 udev
 
 if [[ ${PV} == 9999 ]]; then
        inherit git-r3
@@ -21,26 +20,27 @@ HOMEPAGE="https://atar-axis.github.io/xpadneo/";
 LICENSE="GPL-3"
 SLOT="0"
 
-S="${WORKDIR}/${P}/hid-${PN}"
-MODULE_NAMES="hid-${PN}(kernel/drivers/hid::src)"
-BUILD_PARAMS='V=1 LD="$(tc-getLD)" KERNEL_SOURCE_DIR="${KV_OUT_DIR}"'
-BUILD_TARGETS="modules"
-
 CONFIG_CHECK="INPUT_FF_MEMLESS"
 
+src_compile() {
+       local modlist=( hid-${PN}=kernel/drivers/hid:hid-${PN}:hid-${PN}/src )
+       local modargs=( KERNEL_SOURCE_DIR="${KV_OUT_DIR}" )
+
+       linux-mod-r1_src_compile
+}
+
 src_install() {
-       linux-mod_src_install
+       local DOCS=( docs/{[^i]*.md,descriptors,reports} NEWS.md )
+       linux-mod-r1_src_install
 
        insinto /etc/modprobe.d
-       doins etc-modprobe.d/${PN}.conf
-
-       udev_dorules etc-udev-rules.d/60-${PN}.rules
+       doins hid-${PN}/etc-modprobe.d/${PN}.conf
 
-       dodoc -r ../docs/{[^i]*.md,descriptors,reports} ../NEWS.md
+       udev_dorules hid-${PN}/etc-udev-rules.d/60-${PN}.rules
 }
 
 pkg_postinst() {
-       linux-mod_pkg_postinst
+       linux-mod-r1_pkg_postinst
        udev_reload
 
        local disable_ertm=/sys/module/bluetooth/parameters/disable_ertm
@@ -69,6 +69,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-       linux-mod_pkg_postrm
        udev_reload
 }

diff --git a/games-util/xpadneo/xpadneo-9999.ebuild 
b/games-util/xpadneo/xpadneo-9999.ebuild
index b193e5517951..c1de2e3d642d 100644
--- a/games-util/xpadneo/xpadneo-9999.ebuild
+++ b/games-util/xpadneo/xpadneo-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-# pkgcheck note: toolchain-funcs is not unused
-inherit linux-mod toolchain-funcs udev
+inherit linux-mod-r1 udev
 
 if [[ ${PV} == 9999 ]]; then
        inherit git-r3
@@ -21,26 +20,27 @@ HOMEPAGE="https://atar-axis.github.io/xpadneo/";
 LICENSE="GPL-3"
 SLOT="0"
 
-S="${WORKDIR}/${P}/hid-${PN}"
-MODULE_NAMES="hid-${PN}(kernel/drivers/hid::src)"
-BUILD_PARAMS='V=1 LD="$(tc-getLD)" KERNEL_SOURCE_DIR="${KV_OUT_DIR}"'
-BUILD_TARGETS="modules"
-
 CONFIG_CHECK="INPUT_FF_MEMLESS"
 
+src_compile() {
+       local modlist=( hid-${PN}=kernel/drivers/hid:hid-${PN}:hid-${PN}/src )
+       local modargs=( KERNEL_SOURCE_DIR="${KV_OUT_DIR}" )
+
+       linux-mod-r1_src_compile
+}
+
 src_install() {
-       linux-mod_src_install
+       local DOCS=( docs/{[^i]*.md,descriptors,reports} NEWS.md )
+       linux-mod-r1_src_install
 
        insinto /etc/modprobe.d
-       doins etc-modprobe.d/${PN}.conf
-
-       udev_dorules etc-udev-rules.d/60-${PN}.rules
+       doins hid-${PN}/etc-modprobe.d/${PN}.conf
 
-       dodoc -r ../docs/{[^i]*.md,descriptors,reports} ../NEWS.md
+       udev_dorules hid-${PN}/etc-udev-rules.d/60-${PN}.rules
 }
 
 pkg_postinst() {
-       linux-mod_pkg_postinst
+       linux-mod-r1_pkg_postinst
        udev_reload
 
        local disable_ertm=/sys/module/bluetooth/parameters/disable_ertm
@@ -69,6 +69,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-       linux-mod_pkg_postrm
        udev_reload
 }

Reply via email to