Bump

app-emulation/opencbm/opencbm-0.4.99.104.ebuild

@@ -1,16 +1,14 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
-inherit toolchain-funcs linux-mod udev
+inherit toolchain-funcs linux-mod-r1 udev
 
 if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/OpenCBM/OpenCBM.git"
 else
-	#SRC_URI="http://debian.trikaliotis.net/opencbm/opencbm_${PV}-1.tar.gz"
-	#SRC_URI="http://www.trikaliotis.net/Download/opencbm-${PV}/opencbm-${PV}-source.tar.bz2"
 	SRC_URI="https://github.com/OpenCBM/OpenCBM/archive/v${PV//./_}.tar.gz -> opencbm-${PV}-source.tar.gz
 	https://github.com/OpenCBM/nibtools/archive/master.tar.gz -> nibtools-${PV}-source.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
@@ -30,14 +28,12 @@ DEPEND="virtual/linux-sources
 	virtual/libusb:0"
 S="${WORKDIR}"/OpenCBM-${PV//./_}
 
-BUILD_PARAMS="KDIR=$KERNEL_DIR"
-MODULE_NAMES="cbm(misc:${S}/opencbm/sys/linux:${S}/opencbm/sys/linux)"
-BUILD_TARGETS="all"
+#BUILD_PARAMS="KDIR=$KERNEL_DIR"
+#MODULE_NAMES="cbm(misc:${S}/opencbm/sys/linux:${S}/opencbm/sys/linux)"
+#BUILD_TARGETS="all"
 
 src_prepare() {
 	rm -rf "${WORKDIR}"/${PN}-${PV}/{cbm4wingui,gui4cbm4win.vb6.old,windrv}
-	# convert linefeed
-	#edos2unix `find . -name '*' -type f`
 	# 6502 sources ar always up to date
 	touch `find . -name '*.?65' -type f`
 	# add debian patches no demo & doc & no kernel
@@ -47,19 +43,24 @@ src_prepare() {
 		-e 's,/man/man1,/share/man/man1,g' \
 		-e 's,etc/udev/rules.d,lib/udev/rules.d,g' \
 		-e 's,/info,/share/info,g' -i "${S}"/opencbm/LINUX/config.make
-	# sed correct path
+	# sed correct udev path
 	sed -e 's,xa1541 opencbm/sys/linux/,xa1541,g' \
 		-e 's,etc/udev/rules.d,lib/udev/rules.d,g' -i "${S}"/LINUX/Makefile
 	# copy module makefile that don't intefer with gentoo kernel build system
 	cp "${FILESDIR}"/Makefile "${S}"/opencbm/sys/linux/Makefile
+	# copy nibtools from upstream repo
 	cp -r "${WORKDIR}"/OpenCBM-nibtools-*/* "${S}"/opencbm/nibtools/
 	eapply_user
 }
 
 src_compile() {
+	# Buildsystem mostly broken so -j1 an split the build into the 2 parts.
 	emake -j1 -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" LIBDIR="/usr/$(get_libdir)" all || die "make fail"
 	emake -j1 -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" LIBDIR="/usr/$(get_libdir)" opencbm || die "make fail"
-	linux-mod_src_compile
+
+	local modlist=( cbm=misc:opencbm/sys/linux:opencbm/sys/linux:all )
+	local modargs=( KDIR="${KV_OUT_DIR}" )
+	linux-mod-r1_src_compile
 }
 
 src_install() {
@@ -73,13 +74,12 @@ src_install() {
 	insinto lib/udev/rules.d
 	newins opencbm/sys/linux/45-opencbm-xa1541.rules 45-opencbm-xa1541.rules
 	rm -rf "${D}"/var
-	linux-mod_src_install
-#	generate_modulesd
+	linux-mod-r1_src_install
 }
 
 pkg_postinst() {
 	udev_reload
-	linux-mod_pkg_postinst
+	linux-mod-r1_pkg_postinst
 	"${EROOT}"/usr/lib/opencbm/install_plugin install xa1541
 	"${EROOT}"/usr/lib/opencbm/install_plugin install xu1541
 	"${EROOT}"/usr/lib/opencbm/install_plugin install xum1541
@@ -92,6 +92,5 @@ pkg_prerm() {
 }
 
 pkg_postrm() {
-	linux-mod_pkg_postrm
 	udev_reload
 }