From c135e0c5d99d09b9a18a8dfa8a05bfecf570f498 Mon Sep 17 00:00:00 2001
From: Alexander Tratsevskiy <at@calculate.ru>
Date: Thu, 25 Jan 2024 09:37:57 +0300
Subject: [PATCH] net-wireless/rtl8814au: Version bump

---
 net-wireless/rtl8814au/Manifest               |  3 +-
 .../rtl8814au/rtl8814au-20221110.ebuild       | 28 -------------------
 ...30321.ebuild => rtl8814au-20231211.ebuild} | 16 +++++------
 3 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 net-wireless/rtl8814au/rtl8814au-20221110.ebuild
 rename net-wireless/rtl8814au/{rtl8814au-20230321.ebuild => rtl8814au-20231211.ebuild} (54%)

diff --git a/net-wireless/rtl8814au/Manifest b/net-wireless/rtl8814au/Manifest
index 50a7943f4..d98476f93 100644
--- a/net-wireless/rtl8814au/Manifest
+++ b/net-wireless/rtl8814au/Manifest
@@ -1,3 +1,2 @@
-DIST rtl8814au-20221110.tar.gz 2642540 BLAKE2B 0d7fab629e31f77526c02eea5391d603c19cdeb4c440a15eab984346ab70aa1c0203b2556d580c9b1040f5bd83535bcf6ad28e18119fb7629772618c75f4d8a5 SHA512 1d72cd9188afaa2e015fc4e321eed8fbf6ffafe9d9e624e97eaccbc68acebc6691a032cf6cfe1c44b1fb907db9f010e140c0100c43ffffb2b7206ab017198d8a
-DIST rtl8814au-20230321.tar.gz 2646177 BLAKE2B c458cf6cca2b97ddff5784f1285d0ba1969868507902fe426f7d99f774032a8e09b443df70609f4a56b9bca2ac4d27645cc2ea0c5ba80b2af7865963acab673f SHA512 2c176a3be30dd8398e24a5b7f00bf50f7541225ad25921e1b02cef481450833b6ac65cdbd418303a9ecfbfd7f343296d1d3107cc97049c708e35b9b227723f4f
 DIST rtl8814au-20230623.tar.gz 2646935 BLAKE2B 07b67f3ef585df48c2e1c3ff73ffc16302b5c30ec7313f00a3598b4039b703b7570cc4212f861a64d850fd8e5904552bc6047d61bcf727505e5ea06abb4baa20 SHA512 f2f63786e876d7c91e197a66c35a99c7a4bb3852993b8ecb1725bbeb3b876f84dd9a8e9c8f48daea831a68090afaf83e7e9dbb93a493061ef968f0b1cca6749c
+DIST rtl8814au-20231211.tar.gz 2647484 BLAKE2B 0381051638429b2d280fcbcda0ae6a238ae028d2353ed9e5256b1bef72a303bccffdea4daa0d69076d7dcd968a26cf2addec93e95f3f6172b787459e81a9c442 SHA512 73215e0fa76c9b7b1cc33719f475b78e07bc16b85b1d75ed9f10ae8d8f8d35910f38ccc77493137883efe93aafb9ba0adae17201edbb739c9acb322af512984c
diff --git a/net-wireless/rtl8814au/rtl8814au-20221110.ebuild b/net-wireless/rtl8814au/rtl8814au-20221110.ebuild
deleted file mode 100644
index b4113a3e3..000000000
--- a/net-wireless/rtl8814au/rtl8814au-20221110.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit linux-mod
-
-COMMIT="932df6f7da6c3a384cf91f33eb195097eb0cb6c5"
-
-DESCRIPTION="Realtek 8814AU USB WiFi module for Linux kernel"
-HOMEPAGE="https://github.com/morrownr/8814au"
-SRC_URI="https://github.com/morrownr/8814au/archive/${COMMIT}.tar.gz -> rtl8814au-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64"
-SLOT="0"
-
-DEPEND="virtual/linux-sources"
-
-S="${WORKDIR}/8814au-${COMMIT}"
-
-MODULE_NAMES="8814au(net/wireless)"
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KSRC=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
diff --git a/net-wireless/rtl8814au/rtl8814au-20230321.ebuild b/net-wireless/rtl8814au/rtl8814au-20231211.ebuild
similarity index 54%
rename from net-wireless/rtl8814au/rtl8814au-20230321.ebuild
rename to net-wireless/rtl8814au/rtl8814au-20231211.ebuild
index 9f5139981..f76e8d343 100644
--- a/net-wireless/rtl8814au/rtl8814au-20230321.ebuild
+++ b/net-wireless/rtl8814au/rtl8814au-20231211.ebuild
@@ -4,25 +4,23 @@
 EAPI=8
 inherit linux-mod-r1
 
-COMMIT="6f80699e68fd2a9f2bba3f1a56ca06d1b7992bd8"
+COMMIT="866a9100c7b3f6508b81b31a22cae19dcacdacb9"
 
 DESCRIPTION="Realtek 8814AU USB WiFi module for Linux kernel"
 HOMEPAGE="https://github.com/morrownr/8814au"
-SRC_URI="https://github.com/morrownr/8814au/archive/${COMMIT}.tar.gz -> rtl8814au-${PV}.tar.gz"
+SRC_URI="https://github.com/morrownr/8814au/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 SLOT="0"
 
 DEPEND="virtual/linux-sources"
 
 S="${WORKDIR}/8814au-${COMMIT}"
 
-MODULE_NAMES="8814au(net/wireless)"
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
+src_compile() {
+	local modlist=( 8814au=net/wireless )
+	local modargs=( KSRC="${KV_OUT_DIR}" )
 
-pkg_setup() {
-	linux-mod-r1_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KSRC=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+	linux-mod-r1_src_compile
 }