gentoo auto-resync : 27:06:2024 - 07:59:39

8 files changed, 124 insertions, 59 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 58cab94ec149..5dabde4fc9d2 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk-g729/Manifest b/net-misc/asterisk-g729/Manifest
index 64924c152112..577660941e0f 100644
--- a/net-misc/asterisk-g729/Manifest
+++ b/net-misc/asterisk-g729/Manifest
@@ -12,9 +12,9 @@ DIST codec_g729a-18.0_3.1.9-x86_32.tar.gz 476626 BLAKE2B 7a8a0a763fcae579ac4be28
 DIST codec_g729a-18.0_3.1.9-x86_64.tar.gz 475817 BLAKE2B ef45f1edab67b1fdb57d11340d2b3885c72d9f09f00fdccfdaa8674d61cf95ddf8ace223f29049e1e700f0bdcabd824ffbfa5382e492a1e0d0a47e1ab030d606 SHA512 12bbd2bcef0b7138d0ef261b6b1265f803526ce3c4ec371be830267e01e0e674150f17169742fe72737291b162136ea5224b320b655112cbc10fa207733c7f54
 DIST codec_g729a-20.0_3.1.10-x86_32.tar.gz 476843 BLAKE2B 8d014823184f17c158de9720bc903f841f290f1171344bc7a54ad7cf40627b7fcac697e642c35feef4e6eccff58b7fc85775e5d5a31c518b35a3b6c7bf258b19 SHA512 81d7d0921c9f17b31d9d3a3dd7e81844ee17bc9afd58418c2add40409c3eda932330e93411f32b5af67a42877f6abfba5d9b599812cc0655b2cc9851f1257c3c
 DIST codec_g729a-20.0_3.1.10-x86_64.tar.gz 476178 BLAKE2B f27787c17929deecf048c0b79f38bd3630375d1e09afe142052ff7b4f9ef3d5577a09b11a11aa551ae6d82f44cf40931550fa5612ec132befa3c9e3776b7dd58 SHA512 91df558f4c88af703bde270d0e360ebba074ab5ff917f163f8a525b7fa0e4a2e7480884effafb1253d6a67a72e640d1cdaba75c10c24283655136d8a356dec56
-EBUILD asterisk-g729-16.0.3.1.10.ebuild 1853 BLAKE2B 720f1e9f968bec4f69fa13c5c2b003769a9d0e6c5df69e4b0289121f80a6ac75e817ddcb5e4850a4812268d1783e5e01100907bf1807d3181b9d21cc5ffeb444 SHA512 3975ded0445cb673d59edb14263dcf8cfe90152250d0ff550a796fb1b7e5e4ba88368d764bf41011af9d2b576aff29e3fb7069ea027bcfc21bbcef8f5132f9b7
+EBUILD asterisk-g729-16.0.3.1.10.ebuild 1852 BLAKE2B 34e1b05adf32ec9b39816e66c7aa7c6416bdedcd479faed20d05f9dbd901c8d132bc5954efdc7a686878d79f966b9e856cfa9e547e81d4af4c4e00a001cc406a SHA512 26aa3238448f4d4bd5ae55f17008e3f1fc7d1f89cea7a5bd291cf187285ed6c0dd53e3dba708a14b1cce311e775cd16eca92ac078c37a561b6bc14f2a4f1fc3c
 EBUILD asterisk-g729-16.0.3.1.9-r1.ebuild 1852 BLAKE2B 76fc3059359d737055dfcfe851abb44c5a8764723a626895f1a6ec9fa20ca3adf11bad371eb7ad532726b161951f510cdc3f3ce75b04bb2e494d8b92efd5c33c SHA512 6cf0de82b3f4a65949aafcead6d0801a0b666ee45b0e5ba6f0f1eb569a80bcb02ed82f39579b8eee0bf73dcefcc347ff334db5ad246487ee240dd811f73acfb3
-EBUILD asterisk-g729-18.0.3.1.10.ebuild 1853 BLAKE2B 720f1e9f968bec4f69fa13c5c2b003769a9d0e6c5df69e4b0289121f80a6ac75e817ddcb5e4850a4812268d1783e5e01100907bf1807d3181b9d21cc5ffeb444 SHA512 3975ded0445cb673d59edb14263dcf8cfe90152250d0ff550a796fb1b7e5e4ba88368d764bf41011af9d2b576aff29e3fb7069ea027bcfc21bbcef8f5132f9b7
+EBUILD asterisk-g729-18.0.3.1.10.ebuild 1852 BLAKE2B 34e1b05adf32ec9b39816e66c7aa7c6416bdedcd479faed20d05f9dbd901c8d132bc5954efdc7a686878d79f966b9e856cfa9e547e81d4af4c4e00a001cc406a SHA512 26aa3238448f4d4bd5ae55f17008e3f1fc7d1f89cea7a5bd291cf187285ed6c0dd53e3dba708a14b1cce311e775cd16eca92ac078c37a561b6bc14f2a4f1fc3c
 EBUILD asterisk-g729-18.0.3.1.9.ebuild 1852 BLAKE2B 76fc3059359d737055dfcfe851abb44c5a8764723a626895f1a6ec9fa20ca3adf11bad371eb7ad532726b161951f510cdc3f3ce75b04bb2e494d8b92efd5c33c SHA512 6cf0de82b3f4a65949aafcead6d0801a0b666ee45b0e5ba6f0f1eb569a80bcb02ed82f39579b8eee0bf73dcefcc347ff334db5ad246487ee240dd811f73acfb3
 EBUILD asterisk-g729-20.0.3.1.10.ebuild 1854 BLAKE2B 4c752b0a8237ca355f57a00146232a135f9f40acb867303d99e314212abca387a7fd71df63f9001eab2dd9b97ac1147fb04e779742cbc4b48b4c5f33231ac6a3 SHA512 329bc5ba0b42abee799a984b6bc55eaf47cdf2fc1559ed80cdacc8ba4a21cca710c5c676e72570fe574e0dc6df6151ccc82b9b3193babecb3e6d105c05501fdd
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild
index 9a1121ec9fb7..ba68b2878ec9 100644
--- a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild
@@ -22,7 +22,7 @@ amd64? (
 
 LICENSE="Digium"
 SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
 
diff --git a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild
index 9a1121ec9fb7..ba68b2878ec9 100644
--- a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild
@@ -22,7 +22,7 @@ amd64? (
 
 LICENSE="Digium"
 SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
 
diff --git a/net-misc/r8152/Manifest b/net-misc/r8152/Manifest
index 65187ab07bbe..78ee99b73a4f 100644
--- a/net-misc/r8152/Manifest
+++ b/net-misc/r8152/Manifest
@@ -3,8 +3,7 @@ AUX r8152-2.16.3-kernel-5.19-fix.patch 1599 BLAKE2B e1300601e2dcd98729481a6d146f
 AUX r8152-2.16.3-kernel-6.1-fix.patch 1473 BLAKE2B bebafaeaed61bff9ee058ddc64fef6299703bdf9b0c2cd086c86643b362122a8d691577963b9b64f45729bfa4e72f09fe33d6c61fc195d0675bdcd7affd63d7a SHA512 4c5115946a1086d88bc19aa556782aec45fc05f3e38fab8255bb13a863bd2744c08bca0fd6ed72da8c5171fe801436665f4b10bfc22203c500460942a0a6db2d
 AUX r8152-2.16.3-kernel-6.4.10-fix.patch 731 BLAKE2B 2d7820d7dc749bdd4dbbb165116135af2d6831f17b4721afc9c37bbd078f6915cc6c44ce9cb77941ffc52a399a6065269a578128b2c1bb0823658972f8f81dc2 SHA512 a274fc2d5f998ba0c6bfad74c0a56d50c9b146abe012fdd5eebe9719615876e63f55203f3dcf17397e4e28040cd0b253ef861e2cb9636da9c1d050fa844c226c
 AUX r8152-2.17.1-kernel-6.8-strscpy.patch 1298 BLAKE2B 057d7c31115e5903b040f53c964e62d79a3e05308d5b8b072ca6fbf4a3c08e13dc9975e0ca0b6f6342f9e70fc0c957e642ac6d9fdd9f7d915eb7ca7fb24e405a SHA512 4f19815e4f3f9bb3f7934fc13b7c912ab044270512c887b6c89f1409131b73d248d1462c7b1a464eb7e16c590e99bfe46032b36ca5b676896e995964d66d1028
-DIST r8152-2.16.3.tar.bz2 73331 BLAKE2B 9e22ee6d9d0197def782f77bfd0c88a2d8827d4f8cc0bbb1a6583ab67533cd07ba79a16cd9350272ed18c733fe809ea1ff70596627abdc65d452bdf817628bc8 SHA512 c37bf5199d3a857c9a7a12f3aa4ecfe9c04b49413aea862a053ebee24c137cd35769e5d5cc7e2bb7dd3bf9057f51ffada0b4e0c53cb3d417e05c8e3fc830705c
+AUX r8152-2.17.1-kernel-6.9-fix.patch 4008 BLAKE2B 6566782e57e8b69a2cf183a0d63a9e0c17ce9c83974dc23ef1d8588adca14105b4ef8682ca33225be0c4e2ed5121bbc4cd9d5180f44b9c36655d875505c99668 SHA512 4859d41116474e14aec2b03952d155ec07293941181db5cecb27b389c79d4c03ef8ec1abe540ce3b9f04c1ad835f98a11562484dcf168afb100cad91bc96d334
 DIST r8152-2.17.1.tar.bz2 75156 BLAKE2B 05b55ea17a579add9a9abee89db490685086bfe29aeea6cbfbdbb63a81dbee4d1cac151822c178e52febe4bee14a3b5deb20737f671fcdbc6dd6d01938b1d18c SHA512 e465b524ee8aaed12da8258195fb8a4c9fea0862812c1ab268e31ad6ec61444c4f4332d643124063b389fd1df7a271c6c057537d4cbe67188a1a2262b4793f42
-EBUILD r8152-2.16.3-r1.ebuild 1290 BLAKE2B 82d4ebe9fc9bca31b9a1307eae719745e7916c5d694a052e2e41c0178f2d18947d270ea19564347f8847f33dad132b9b4af1fb102e3a0b8e10ed87cfcdb0e4be SHA512 460cef4288683e56e13885a1a3bbc588b4816a9770bbffb22b81e980c50f9848b7cb15b5808ba88a204d0e5ad8372a8e741fc8617efac2e1b3cffc6309a802c3
-EBUILD r8152-2.17.1.ebuild 1244 BLAKE2B 39a421b6c3e0dac8894e75a11b8a435a656096a1de1dabeaf72db5ea672b9f76c6e2630e728b1af7abc2fdd4d0364e734fd23635a59b64e6bec124ecc3145bf9 SHA512 61adcbff9e86f1ec8aab62a384dfc3e8484606cd0b59dfee4f1434af802fddd0ce95b13d5f62218f362951ae638e6bfe10f24bf73d968345b1090c81656be6fa
+EBUILD r8152-2.17.1.ebuild 1293 BLAKE2B 19c8c4a1507ce6722f552c2c566e449b06a3b114b5b04e89c9259832e23e03d4d655084ee0d2aaf55d862573a524f762e8afc997a36ac8e61873c6e9d0ecf005 SHA512 069a53b153ac5d61fdebd8bcaa1411b904002b46124e81799efa601ca7ceb2fb4200e49eec7d8818b1a5abda049460e08ba3bdc0d94358116c1b4224ee10dafb
 MISC metadata.xml 660 BLAKE2B 1f7bd7d75e5fc3b88b140f88b82390b09cbffed8770b73b4584f7d9114fd1b97a84f745881d424f30c1a738c332bb04bab3d651bd9734f0170164eb8158ef098 SHA512 c0258ae24671a18801a9a499869267b2c3d2d0350e1fbbf91db6fe2358326bb27551623ef93c9c9a9bebde3c08520463eae00a05802053a0f5b7ade1b0f5ea4d
diff --git a/net-misc/r8152/files/r8152-2.17.1-kernel-6.9-fix.patch b/net-misc/r8152/files/r8152-2.17.1-kernel-6.9-fix.patch
new file mode 100644
index 000000000000..433d3deab34e
--- /dev/null
+++ b/net-misc/r8152/files/r8152-2.17.1-kernel-6.9-fix.patch
@@ -0,0 +1,117 @@
+From: https://github.com/wget/realtek-r8152-linux/pull/41
+From a5b3b4a882a3a637ccfa447dc7d2e84eac9ef0fc Mon Sep 17 00:00:00 2001
+From: "oleg.hoefling" <oleg.hoefling@gmail.com>
+Date: Wed, 22 May 2024 00:44:37 +0200
+Subject: [PATCH] add compat for 6.9.X kernels
+
+Signed-off-by: oleg.hoefling <oleg.hoefling@gmail.com>
+--- a/r8152.c
++++ b/r8152.c
+@@ -950,7 +950,10 @@ struct r8152 {
+ 		void (*up)(struct r8152 *tp);
+ 		void (*down)(struct r8152 *tp);
+ 		void (*unload)(struct r8152 *tp);
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++		int (*eee_get)(struct r8152 *tp, struct ethtool_keee *eee);
++		int (*eee_set)(struct r8152 *tp, struct ethtool_keee *eee);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+ 		int (*eee_get)(struct r8152 *tp, struct ethtool_eee *eee);
+ 		int (*eee_set)(struct r8152 *tp, struct ethtool_eee *eee);
+ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */
+@@ -19099,7 +19102,11 @@ static void rtl8152_get_strings(struct net_device *dev, u32 stringset, u8 *data)
+ }
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++static int r8152_get_eee(struct r8152 *tp, struct ethtool_keee *eee)
++#else
+ static int r8152_get_eee(struct r8152 *tp, struct ethtool_eee *eee)
++#endif
+ {
+ 	u32 lp, adv, supported = 0;
+ 	u16 val;
+@@ -19115,17 +19122,32 @@ static int r8152_get_eee(struct r8152 *tp, struct ethtool_eee *eee)
+ 
+ 	eee->eee_enabled = tp->eee_en;
+ 	eee->eee_active = !!(supported & adv & lp);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++	ethtool_convert_legacy_u32_to_link_mode(eee->supported, supported);
++	ethtool_convert_legacy_u32_to_link_mode(eee->advertised, tp->eee_adv);
++	ethtool_convert_legacy_u32_to_link_mode(eee->lp_advertised, lp);
++#else
+ 	eee->supported = supported;
+ 	eee->advertised = tp->eee_adv;
+ 	eee->lp_advertised = lp;
++#endif
+ 
+ 	return 0;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++static int r8152_set_eee(struct r8152 *tp, struct ethtool_keee *eee)
++#else
+ static int r8152_set_eee(struct r8152 *tp, struct ethtool_eee *eee)
++#endif
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++	u32 advertised = 0;
++	ethtool_convert_link_mode_to_legacy_u32(&advertised, eee->advertised);
++	u16 val = ethtool_adv_to_mmd_eee_adv_t(advertised);
++#else
+ 	u16 val = ethtool_adv_to_mmd_eee_adv_t(eee->advertised);
+-
++#endif
+ 	tp->eee_en = eee->eee_enabled;
+ 	tp->eee_adv = val;
+ 
+@@ -19134,7 +19156,11 @@ static int r8152_set_eee(struct r8152 *tp, struct ethtool_eee *eee)
+ 	return 0;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++static int r8153_get_eee(struct r8152 *tp, struct ethtool_keee *eee)
++#else
+ static int r8153_get_eee(struct r8152 *tp, struct ethtool_eee *eee)
++#endif
+ {
+ 	u32 lp, adv, supported = 0;
+ 	u16 val;
+@@ -19150,15 +19176,25 @@ static int r8153_get_eee(struct r8152 *tp, struct ethtool_eee *eee)
+ 
+ 	eee->eee_enabled = tp->eee_en;
+ 	eee->eee_active = !!(supported & adv & lp);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++	ethtool_convert_legacy_u32_to_link_mode(eee->supported, supported);
++	ethtool_convert_legacy_u32_to_link_mode(eee->advertised, tp->eee_adv);
++	ethtool_convert_legacy_u32_to_link_mode(eee->lp_advertised, lp);
++#else
+ 	eee->supported = supported;
+ 	eee->advertised = tp->eee_adv;
+ 	eee->lp_advertised = lp;
++#endif
+ 
+ 	return 0;
+ }
+ 
+ static int
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++rtl_ethtool_get_eee(struct net_device *net, struct ethtool_keee *edata)
++#else
+ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
++#endif
+ {
+ 	struct r8152 *tp = netdev_priv(net);
+ 	int ret;
+@@ -19185,7 +19221,11 @@ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
+ }
+ 
+ static int
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++rtl_ethtool_set_eee(struct net_device *net, struct ethtool_keee *edata)
++#else
+ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata)
++#endif
+ {
+ 	struct r8152 *tp = netdev_priv(net);
+ 	int ret;
diff --git a/net-misc/r8152/r8152-2.16.3-r1.ebuild b/net-misc/r8152/r8152-2.16.3-r1.ebuild
deleted file mode 100644
index 82753f37ac20..000000000000
--- a/net-misc/r8152/r8152-2.16.3-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod-r1 udev
-
-DESCRIPTION="r8152 driver for Realtek USB FE / GBE / 2.5G Gaming Ethernet Family Controller"
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-usb-3-0-software"
-SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}"
-
-IUSE="+center-tap-short"
-
-# https://github.com/wget/realtek-r8152-linux/ keeps reasonably up to date
-# with kernel support patches. It appears to be used by the AUR maintainer.
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.16.3-kernel-5.19-fix.patch
-	"${FILESDIR}"/${PN}-2.16.3-kernel-6.1-fix.patch
-	"${FILESDIR}"/${PN}-2.16.3-kernel-6.4.10-fix.patch
-	"${FILESDIR}"/${PN}-2.16.3-asus-c5000-support.patch
-)
-
-src_compile() {
-	local modlist=( ${PN}=kernel/net/usb:. )
-	local modargs=(
-		KERNELDIR="${KV_OUT_DIR}"
-		CONFIG_CTAP_SHORT="$(usex center-tap-short on off)"
-	)
-
-	linux-mod-r1_src_compile
-}
-
-src_install() {
-	linux-mod-r1_src_install
-	udev_dorules 50-usb-realtek-net.rules
-}
-
-pkg_postinst() {
-	linux-mod-r1_pkg_postinst
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-misc/r8152/r8152-2.17.1.ebuild b/net-misc/r8152/r8152-2.17.1.ebuild
index 865057ee5c0d..0c0485efb61b 100644
--- a/net-misc/r8152/r8152-2.17.1.ebuild
+++ b/net-misc/r8152/r8152-2.17.1.ebuild
@@ -24,6 +24,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.16.3-kernel-6.4.10-fix.patch
 	"${FILESDIR}"/${PN}-2.16.3-asus-c5000-support.patch
 	"${FILESDIR}"/${PN}-2.17.1-kernel-6.8-strscpy.patch
+	"${FILESDIR}"/${PN}-2.17.1-kernel-6.9-fix.patch
 )
 
 src_compile() {