gentoo auto-resync : 21:07:2023 - 01:09:27

6 files changed, 112 insertions, 65 deletions

diff --git a/net-misc/r8125/Manifest b/net-misc/r8125/Manifest
index 6c813b42c95c..96c7422442a0 100644
--- a/net-misc/r8125/Manifest
+++ b/net-misc/r8125/Manifest
@@ -2,12 +2,13 @@ AUX r8125-9.008.00-linux-5.17.patch 4449 BLAKE2B d00d43f1efae664d02a5c8e7fb67161
 AUX r8125-9.008.00-linux-5.18.patch 1247 BLAKE2B 47f7aa546b6df11b8e1a95ff4be4c6964120421026da8977d67da0050395e5f1cff64f5cdbba28da5f502eff95e3db728b1acc834b82a8d186843b7fd0a14964 SHA512 577c0c5b69f6b41b4474404abd99bb946939373612eb23e320a9c014011f643d173c1597ba6f60a8a350f4c095eeddd99ce837fe5da884320229b047616309df
 AUX r8125-9.009.01-linux-5.19.patch 1423 BLAKE2B 3b587a9261aa695cb9fc5e27032d23b15ff557aa1a467985448ce38b5e259d08d5690406b42d1dc068a82a748de0dff53607bf70ac5515d5c9ced0e7803ef4c0 SHA512 803c1f70d9af86f4ba28e72338c3fff2b2976bc9dac5ca2f733f11382afc0a2a4ac018560e70cbae8ecbd3928ea2a79b010630420f4af66475ce5c9bb3ef73a8
 AUX r8125-9.011.00-linux-6.1.patch 1141 BLAKE2B b018c01a34b1fdf6f3cdaebfeff0a2d3dee4ddc0e47cb4f7a2e1953af9a7d7354e161ab9687e5c927135cf945597a7d276fa5ee3f1a9c9f17ed5e294c7e123ab SHA512 0a23b8477cb6d1de10f6b5fedabc0d8de25963f038b425c3e17851cf5eb4bd7cd76c52625c27be71ff5129fc78cc2325cba6ec26acd5bbc9f0995eeec5970587
+AUX r8125-9.011.01-linux-6.2.patch 1523 BLAKE2B bb8d828940f2a94c11c73ff6bcabdc63a4dbd8426fdc6fc53c2416784248a93f8e071af1a25c2df57e5799031061664fcf5a1eea77812f62a222e4dbe9201e07 SHA512 03e7148d2d1363cca8bce1a7a35f28379d059a515e2107db59cf43623b4a7d67ec148bf3363c71c81f68cf667dfe2cbd1637210f06b031bfa21a8c65a2246daa
 DIST r8125-9.008.00.tar.bz2 89622 BLAKE2B d1106086d1bca53484f8536072cddd506087b5d49983cbb91e921e86674c074b38c8a01cb51d2ea5793d8ffbff6e97ab05e48720ff00a805c4096a1d62a0cc30 SHA512 ff740a49fcc94b3de826f6299c489ed3f92ba9123ca2b2fe3c9035eecd16d518b6a4e6c2fa2531bb670c52097a52a0fb2fdf71b721efb20c83bb59d94d99c6c6
 DIST r8125-9.009.01.tar.bz2 89897 BLAKE2B 65f64f504cedc7244bdae10fd1638e031eb103f562cd71d32b5f36b15541704086df8cea16829b289e8be61bacf3de559616884d1672a4d6b8e47211816de8d3 SHA512 8b717447e2048df0d88d8350da2edb58f704e893498fbebea4aa2a3ac45ea050d70e73e78d41ab94562228b9c01e6fe59810c501c5bb880db446c05b9b6aee0d
 DIST r8125-9.009.02.tar.bz2 89916 BLAKE2B 2dd8ad226f8ad9dd4e6646cdce66f0c12a6a657aa39c6e91892f410780ed245046fc94f247939958db7b950aa045e011716ecd7f6ebb6099ca3d9ffc54cfd0de SHA512 29bfe60410727f09b004f172e5046292eff511dfca5af8a21c24719e4068925103ba12af0ce808316ef206b329ce886693e7330c1c68d8e77fc50ab40bd7dcfe
 DIST r8125-9.011.01.tar.bz2 97867 BLAKE2B 0981c71795d3e839b97f7b41dbaddcc0743676c6bd0b656258e6e9b2e0879128ae4869e9ab3ab837d0ae10eb8c963177c3779b4e4a69d8a5c3d95b7b8d54f9c5 SHA512 833199cc0ce8179ef93c202fc89d4c4368b73e9515d1ef2550ebb209243dd2c8943aa9f267903d8fa21c46304b7703410f1c354d4ce1b6f6aee7ece97017dba2
-EBUILD r8125-9.008.00.ebuild 1505 BLAKE2B 7eaed2d4118916c7160f66a83d8187261aacbac2bb2d79754474652040afa56ad5c221c00d82e27698f92e7fcbd2e01592b9543a7de85ab25e99b3bc2b777405 SHA512 5d69f6d2614955afc7bc519c45a53f12a26e8545071559a92e83c3b960b3ec598a7f222512eb3b12f0d6473fb8242223b19fd2dfc0c88bc5497b9ac4da22c3f2
-EBUILD r8125-9.009.01.ebuild 1291 BLAKE2B 09509ab84c55c23fd7a17ec3690ce1790df4a4b69ce3fee94d0542b5a379486fa6d4df658a9f02f68f1fb56f7da75c5bc00b494862fb25c54d6fc661cebf7fbb SHA512 28914ec05c9afae5e1936013488dc84161e16c1227b0756909013665e82c9237695390147cf855828af229fbdea3e00617f49c22637a6d8ebac71445a204e200
-EBUILD r8125-9.009.02.ebuild 1184 BLAKE2B 9a503dffad1c25db533f5af0889b1cb9b2978792f162decee7429a2988bed82c3ee408e9234da519ed304eefe8d344577e1c93098db9856d34ee886479967a72 SHA512 04f23d18649ff16c1c693d295f279999a3ad5026540b82385128b98d1fced33fa781a859168e605ec161c3b347b014b26d21130eb0fa31c0648d90e002e1f407
-EBUILD r8125-9.011.01.ebuild 1178 BLAKE2B 82a51fce6106e019d4062f3cea4cb050b3aba4247dbccbb73e4be92d11154450e83a051d0b97a956e7c64487b93dbbed658c810595ca4c8339fc1e39c7a5aec9 SHA512 c341dc8af0fcb33b5155d6583a61da1cb7cb1d0e59df6b86fb3d01ce04924117bd5a1eb23620a00d2a73d5f9ac743bae7269d03824caeec67b250aef952e2088
+EBUILD r8125-9.008.00-r1.ebuild 1510 BLAKE2B 19d165085a3119a70df54e997300f88bdae903b6a34fbb558143a80ca3984732e37c647e7a3f5d0892ec267807d9fce2d40a8c377144ba59022de1475d50155d SHA512 702b348c97f4a2f41c7f2bb95b8319c13b1717b000344f741869e2ccee2a5470138fbc786329c856dc55a981d384e3f7b2ee78f3351f95cb327c880a664ced7d
+EBUILD r8125-9.009.01-r1.ebuild 1296 BLAKE2B dd4c6e2b6a59186d9ac1341bcf14b125c8b28206b09586e6c10def5399e9adf7912cf97c924c66705acc060622e139bbce0859d3344c44dc674a60aae7c9d0e4 SHA512 86bea15e017ae59010d2f73853710b88804bedab4099858de352e19729d56f055dacf7c7a2ca54120be57632b681c8910871c717aad7f93fdb0ff63cfec1e777
+EBUILD r8125-9.009.02-r1.ebuild 1189 BLAKE2B 491fe1a223eeeaa66c9b844acbf05677715dc269acc2bb9468ccc40d01b5e0ccc8786d8ea377e92985f42d3df28ce5c7964902ef193b7a544b19fdd6c275bd50 SHA512 5fd5df7b14030b4cc137e6f0c71d34c4e4cdaee32bd65c8e3773cc5b188367dbcca58f30bcea8068d180b6daf35d0605f0de5cdb6af5c31060b31c1e5896269c
+EBUILD r8125-9.011.01-r1.ebuild 1252 BLAKE2B 50c40497895db2585554335f560a773dc9bd781b8d2f99b077bbc70165c7a8a8557a6b3cf6061232903ab6a9b830c3a684a3acb4a7b74e6589a0422103e8b2a7 SHA512 1a1051ea7007a2aa73a87f335a43bbb8efb68e7eb21396a023ae5cee0f710196158dbd3bf44e4d2b9d690e74cd23d317aeef4f6f8e00d6376b9b1c05749ee74f
 MISC metadata.xml 840 BLAKE2B 6fa88a6b1b49f0abd18ca64abf2ab93a04e89d51c66ebb602ca5070c56723fbe79e4a0fcfa49b4cc90e3ec904730c8e39b1a2159fcae0f036035d5696537a5a4 SHA512 f15e195ac564002f169610c0490f1f377716260e758241d5228a3b6c7d481de135c03a4da1e5c2eb121e4539a2abceabc3a4e1d26d8d987e093b981dd6eaea9f
diff --git a/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch b/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch
new file mode 100644
index 000000000000..26bb8620fbfd
--- /dev/null
+++ b/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch
@@ -0,0 +1,42 @@
+From 2ef10e8ccbd16a67a1585ebb627af0f1ae172e0f Mon Sep 17 00:00:00 2001
+From: Evgeny Grin <k2k@narod.ru>
+Date: Tue, 27 Jun 2023 11:16:26 +0300
+Subject: [PATCH] Patched PTP functionality for Linux 6.2+
+
+---
+ src/r8125_ptp.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/r8125_ptp.c b/src/r8125_ptp.c
+index 6010a18..b92fb18 100644
+--- a/src/r8125_ptp.c
++++ b/src/r8125_ptp.c
+@@ -195,6 +195,13 @@ static int rtl8125_phc_adjfreq(struct ptp_clock_info *ptp, s32 delta)
+         return 0;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0)
++static int rtl8125_phc_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)
++{
++        return rtl8125_phc_adjfreq(ptp, scaled_ppm_to_ppb(scaled_ppm));
++}
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */
++
+ static int rtl8125_phc_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts64)
+ {
+         struct rtl8125_private *tp = container_of(ptp, struct rtl8125_private, ptp_clock_info);
+@@ -296,7 +303,11 @@ static const struct ptp_clock_info rtl_ptp_clock_info = {
+         .n_per_out  = 0,
+         .n_pins     = 0,
+         .pps        = 1,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,2,0)
+         .adjfreq    = rtl8125_phc_adjfreq,
++#else  /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */
++        .adjfine    = rtl8125_phc_adjfine,
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */
+         .adjtime    = rtl8125_phc_adjtime,
+         .gettime64  = rtl8125_phc_gettime,
+         .settime64  = rtl8125_phc_settime,
+-- 
+2.41.0.windows.1
+
diff --git a/net-misc/r8125/r8125-9.008.00.ebuild b/net-misc/r8125/r8125-9.008.00-r1.ebuild
index ba9eb264d3da..3779fd117278 100644
--- a/net-misc/r8125/r8125-9.008.00.ebuild
+++ b/net-misc/r8125/r8125-9.008.00-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit linux-info linux-mod
+inherit linux-mod-r1
 
 DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
 HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
@@ -16,8 +16,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-MODULE_NAMES="r8125(net:${S}/src)"
-BUILD_TARGETS="modules"
 IUSE="+multi-tx-q ptp +rss use-firmware"
 
 PATCHES=(
@@ -25,21 +23,23 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
 	"${FILESDIR}/${PN}-9.009.01-linux-5.19.patch"
 	"${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
+	"${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645
 )
 
 CONFIG_CHECK="~!R8169"
 WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
 
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-	BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)"
-	BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)"
-	BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)"
-	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
-}
-
-src_install() {
-	linux-mod_src_install
-	einstalldocs
+src_compile() {
+	local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
+	local modargs=(
+		# Build parameters
+		KERNELDIR="${KV_OUT_DIR}"
+		# Configuration settings
+		ENABLE_PTP_SUPPORT=$(usex ptp y n)
+		ENABLE_RSS_SUPPORT=$(usex rss y n)
+		ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
+		ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
+	)
+
+	linux-mod-r1_src_compile
 }
diff --git a/net-misc/r8125/r8125-9.009.01.ebuild b/net-misc/r8125/r8125-9.009.01-r1.ebuild
index a88080038413..87bff3e7fb42 100644
--- a/net-misc/r8125/r8125-9.009.01.ebuild
+++ b/net-misc/r8125/r8125-9.009.01-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit linux-info linux-mod
+inherit linux-mod-r1
 
 DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
 HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
@@ -14,29 +14,29 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-MODULE_NAMES="r8125(net:${S}/src)"
-BUILD_TARGETS="modules"
 IUSE="+multi-tx-q ptp +rss use-firmware"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
 	"${FILESDIR}/${PN}-9.009.01-linux-5.19.patch"
 	"${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
+	"${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645
 )
 
 CONFIG_CHECK="~!R8169"
 WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
 
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-	BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)"
-	BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)"
-	BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)"
-	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
-}
-
-src_install() {
-	linux-mod_src_install
-	einstalldocs
+src_compile() {
+	local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
+	local modargs=(
+		# Build parameters
+		KERNELDIR="${KV_OUT_DIR}"
+		# Configuration settings
+		ENABLE_PTP_SUPPORT=$(usex ptp y n)
+		ENABLE_RSS_SUPPORT=$(usex rss y n)
+		ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
+		ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
+	)
+
+	linux-mod-r1_src_compile
 }
diff --git a/net-misc/r8125/r8125-9.009.02.ebuild b/net-misc/r8125/r8125-9.009.02-r1.ebuild
index bdeb5b0245c5..61bad3803fde 100644
--- a/net-misc/r8125/r8125-9.009.02.ebuild
+++ b/net-misc/r8125/r8125-9.009.02-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit linux-info linux-mod
+inherit linux-mod-r1
 
 DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
 HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
@@ -14,27 +14,27 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-MODULE_NAMES="r8125(net:${S}/src)"
-BUILD_TARGETS="modules"
 IUSE="+multi-tx-q ptp +rss use-firmware"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
+	"${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645
 )
 
 CONFIG_CHECK="~!R8169"
 WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
 
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-	BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)"
-	BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)"
-	BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)"
-	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
-}
-
-src_install() {
-	linux-mod_src_install
-	einstalldocs
+src_compile() {
+	local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
+	local modargs=(
+		# Build parameters
+		KERNELDIR="${KV_OUT_DIR}"
+		# Configuration settings
+		ENABLE_PTP_SUPPORT=$(usex ptp y n)
+		ENABLE_RSS_SUPPORT=$(usex rss y n)
+		ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
+		ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
+	)
+
+	linux-mod-r1_src_compile
 }
diff --git a/net-misc/r8125/r8125-9.011.01.ebuild b/net-misc/r8125/r8125-9.011.01-r1.ebuild
index d09aaaa2e674..ed61c4d34909 100644
--- a/net-misc/r8125/r8125-9.011.01.ebuild
+++ b/net-misc/r8125/r8125-9.011.01-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit linux-info linux-mod
+inherit linux-mod-r1
 
 DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
 HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
@@ -14,24 +14,28 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-MODULE_NAMES="r8125(net:${S}/src)"
-BUILD_TARGETS="modules"
 IUSE="+multi-tx-q ptp +rss use-firmware"
 
+PATCHES=(
+	"${FILESDIR}/${P}-linux-6.2.patch" # bug 908645
+)
+
 CONFIG_CHECK="~!R8169"
 WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
 
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-	BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)"
-	BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)"
-	BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)"
-	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
-	BUILD_PARAMS+=" ENABLE_PAGE_REUSE=y ENABLE_RX_PACKET_FRAGMENT=y"
-}
-
-src_install() {
-	linux-mod_src_install
-	einstalldocs
+src_compile() {
+	local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
+	local modargs=(
+		# Build parameters
+		KERNELDIR="${KV_OUT_DIR}"
+		# Configuration settings
+		ENABLE_PTP_SUPPORT=$(usex ptp y n)
+		ENABLE_RSS_SUPPORT=$(usex rss y n)
+		ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
+		ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
+		ENABLE_PAGE_REUSE=$(usex ptp n y) # Not compatible with PTP
+		ENABLE_RX_PACKET_FRAGMENT=$(usex ptp n y) # Not compatible with PTP
+	)
+
+	linux-mod-r1_src_compile
 }