gentoo auto-resync : 04:12:2022 - 21:03:51

8 files changed, 8 insertions, 82 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 1a0908d08971..fa2153986041 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index f4344d144200..e107282b0c2c 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,8 +1,7 @@
-AUX r8168-8.049.02-5.17-fix.patch 2572 BLAKE2B 7bbd4de5576e1686a269ae88b68eb6f3317affe6192f2271fa21bfaf2ca5bb8d59c8fc3ae4e1f41cb9d325e12dbbfe83fc4ab166378895a68f4c11a98cf6aa92 SHA512 7a03481aa0c195188e975dcd99a3954dda45601fde2d7f110d4840ff498fb5a274d8d9bde83a8d83520a506f8e5bebbb1aea18f75b1c2e959d916f3b0359d900
 AUX r8168-8.050.02-5.18-fix.patch 2340 BLAKE2B d85b0d826b58bad42999309d81bd2a7a5202f81dfe516d32c0a7857d63394c70e5e9f66dcdfa03f8f05dce525204a225c6fa1c73dbd6a0cc2dae7a3995be120f SHA512 952660cd26f2c14e21b45bb0fa88012f980f7999b1f33849a295bc757063f25c2b5911f155305d4cc0d671b503acfc315901d584a83c78c47aeb76ee8301f3d7
 AUX r8168-8.050.03-5.19-fix.patch 849 BLAKE2B 1913abf46a1b0fa22587f64f5c81e87414e3bbf8d4fd392ce8eafe1405ef6499abf98cee4f26866216d781b6c0e7773dbd5867d4fe49038df3af001a4d81e826 SHA512 fe5977cfd0608a2335c96316568ef20ac4e6ae7913250f6fdfb885a1bf3f50a4de64c6102631650b5e1f4d752132086efa589a95e4cbb2086571fb3545847717
-DIST r8168-8.049.02.tar.bz2 113195 BLAKE2B ee34ac7249d732a867384fdd2c87321a513e7b2770c79d0c13666edca7d4bf752d853d7f91554d7ee716b3f30ec5f3a69aed96221a79a60282f0b6d2f70f05d6 SHA512 8ccb69ab533cde6ff88f0e8af2dd66f7e6ce9467020a727d47748c5109b64d6d14eee6bc151db5ddbe70a476a2def5f2faf3871902b335074f43dd05484d39e0
 DIST r8168-8.050.03.tar.bz2 115525 BLAKE2B 9681417c5ded9d089259d80226a16789beaacf31902d896410d581927468c44486a4c496e45d9973851ccca2d4c408159064452849b03347c789390b2b23e57b SHA512 b4c0af2f4e6b9dc36f2db9e33f465d8598afa0b28577ea1f016617e853af00cf41886941fd8173a5b035e219d87a0fae28771230079c88f34039efe669c1e1c6
-EBUILD r8168-8.049.02-r1.ebuild 1116 BLAKE2B 5d3323e1997a3f3948cd197b92570044664a1d90c57bb5e997701755e74feb1caf677bf585b27c2870d350d87b61db9d3b31400ef44dae52821688a3292ca2c5 SHA512 30090d6e07e5abcb5e2b3983365773846a9226fba7d661742f6f0256c4c856f5f641725b81958a9c49c1bea544e063ef862feed892d500035db4d6648ac6b1c5
+DIST r8168-8.051.02.tar.bz2 115969 BLAKE2B 28b809c0330920ee0db7a8f8d41e178882531cd0a6793efeadd9670b1a9b5cbe903061073fd1d461f4234feb41249a244f9ef35cdbb780da498e5a6d6f1a5490 SHA512 2f29a413e7db2b7295ea0a970b3385de1dfd6e41e1820097355687daa5c8d155c1cf6115c72875bff4f366365579bffc81733469a62d76f437065b7e514387ca
 EBUILD r8168-8.050.03.ebuild 1163 BLAKE2B b2c551916ca8a3314b2be6e57c3705c85368824164d203e7a8f856aa416921720b68d77f16c3a5389c7d3b545b4458dc5b0e747891e59cab9042f4b0e74823f9 SHA512 86bffbb8d2772c8a56d54429dfe2b76be59ce6e05128b56c802d48fba6bd2980968103edf70cd699c4ba9b21ada0337ed1e84efb7ad3e0f74ee4d2c42714e2c1
+EBUILD r8168-8.051.02.ebuild 1062 BLAKE2B e2834e08258d151da481ffef3a26a9055c7652a2ad8bc7ffb26395655eee787b23e414a37a5f0cc8232b5d611055e01cf1597f9418d77beea527e5928e6aee3d SHA512 570271a2042db2336aa685f608b5b523ce5c372310ada7369c635b26cf39d87990e4ea9141aa75ef915ab9af7b0b17666f08cbe53a151f0241c7683512e0c43a
 MISC metadata.xml 577 BLAKE2B 0335cbfc902163abd4ffef0ad089b15ae7eaee15e41ed7760834d0329662a8ea0c66d68366a779265205557abe31bf3055b474f6bda7469e803a6240c3e68951 SHA512 f27ae61be558fe46b14fdf43a8d975c71cc900788761e6c5044eea6e8f80ddb6528b0d9d711844b6c8b45e58401a8736d08c40827fa0ceb99be32a3a0abd7086
diff --git a/net-misc/r8168/files/r8168-8.049.02-5.17-fix.patch b/net-misc/r8168/files/r8168-8.049.02-5.17-fix.patch
deleted file mode 100644
index 9e4e77615458..000000000000
--- a/net-misc/r8168/files/r8168-8.049.02-5.17-fix.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-PDE_DATA has been replaced with pde_data
-netdev->dev_addr is now const and uses assignment helpers like eth_hw_addr_set
-
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=359745d
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=48eab83
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=adeef3e
-
---- a/src/r8168_n.c
-+++ b/src/r8168_n.c
-@@ -95,6 +95,10 @@
- #include <linux/seq_file.h>
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-+#define PDE_DATA pde_data
-+#endif
-+
- #define FIRMWARE_8168D_1    "rtl_nic/rtl8168d-1.fw"
- #define FIRMWARE_8168D_2    "rtl_nic/rtl8168d-2.fw"
- #define FIRMWARE_8168E_1    "rtl_nic/rtl8168e-1.fw"
-@@ -563,7 +567,7 @@
- static void rtl8168_down(struct net_device *dev);
- 
- static int rtl8168_set_mac_address(struct net_device *dev, void *p);
--void rtl8168_rar_set(struct rtl8168_private *tp, uint8_t *addr);
-+void rtl8168_rar_set(struct rtl8168_private *tp, const uint8_t *addr);
- static void rtl8168_desc_addr_fill(struct rtl8168_private *);
- static void rtl8168_tx_desc_init(struct rtl8168_private *tp);
- static void rtl8168_rx_desc_init(struct rtl8168_private *tp);
-@@ -24129,9 +24133,17 @@
-         rtl8168_rar_set(tp, mac_addr);
- 
-         for (i = 0; i < MAC_ADDR_LEN; i++) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
-                 dev->dev_addr[i] = RTL_R8(tp, MAC0 + i);
-                 tp->org_mac_addr[i] = dev->dev_addr[i]; /* keep the original MAC address */
-+#else
-+                mac_addr[i] = RTL_R8(tp, MAC0 + i);
-+                tp->org_mac_addr[i] = mac_addr[i]; /* keep the original MAC address */
-+#endif
-         }
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-+        eth_hw_addr_set(dev, mac_addr);
-+#endif
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
-         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
- #endif
-@@ -24159,9 +24171,11 @@
-                 return -EADDRNOTAVAIL;
- 
-         spin_lock_irqsave(&tp->lock, flags);
--
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
-         memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
--
-+#else
-+        eth_hw_addr_set(dev, addr->sa_data);
-+#endif
-         rtl8168_rar_set(tp, dev->dev_addr);
- 
-         spin_unlock_irqrestore(&tp->lock, flags);
-@@ -24177,7 +24191,7 @@
-  *****************************************************************************/
- void
- rtl8168_rar_set(struct rtl8168_private *tp,
--                uint8_t *addr)
-+                const uint8_t *addr)
- {
-         uint32_t rar_low = 0;
-         uint32_t rar_high = 0;
diff --git a/net-misc/r8168/r8168-8.049.02-r1.ebuild b/net-misc/r8168/r8168-8.051.02.ebuild
index 6686979b10d9..4258fbb99cdb 100644
--- a/net-misc/r8168/r8168-8.049.02-r1.ebuild
+++ b/net-misc/r8168/r8168-8.051.02.ebuild
@@ -8,14 +8,14 @@ inherit linux-info linux-mod
 DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
 HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
 
-# "GBE Ethernet LINUX driver r8168 for kernel up to 5.6" from above link,
+# "GBE Ethernet LINUX driver r8168 for kernel up to 5.19" from above link,
 # we need to mirror it to avoid users from needing to fill a captcha to
 # download
 SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 MODULE_NAMES="r8168(net:${S}/src)"
 BUILD_TARGETS="modules"
@@ -24,9 +24,6 @@ IUSE="use-firmware"
 CONFIG_CHECK="~!R8169"
 WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
 
-PATCHES=(
-	"${FILESDIR}/r8168-8.049.02-5.17-fix.patch"
-)
 pkg_setup() {
 	linux-mod_pkg_setup
 	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index b21fd297a8c7..584d30e70f79 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -5,6 +5,6 @@ AUX radvd.conf 337 BLAKE2B 67d50a761449b35389580ac956758f5c8c9373a14294a9e98e823
 AUX radvd.service 603 BLAKE2B fb573b528050d772926f3cb3cf82984b946345f636b661583f3aa5ef720a664cc13b20b8435ad2bcdd5bbdbad6451530384cd869f6d33d4e6f2ccf014ff9871b SHA512 3371d18e71ddb7672e929152d9f93201b49c1ce08c77d59cbcac7654362690a9ab97db08519f5fbe210738595aa52f30f5972cacca988b9274e2218c21bc7dd2
 DIST radvd-2.19.tar.xz 168264 BLAKE2B e28705837263d2d377721e4eaee56b2f86d636d77cf052f08a7c74d5d7f3871f6821a2681ba4997f283b4debe9b3df28a88b01f6fc16b87ee7c3f8b6bbf431b4 SHA512 a1eb40af90fc83ebab2517c16a0f7e85c11338ab276bec400b7c33177748d1e36bc5abd7e373b6742f12f7c690dd7ae6b951bc832c7de9bbb56f7e9bc844ed22
 EBUILD radvd-2.19-r2.ebuild 1415 BLAKE2B a964bab2f685a74db1f08a15463b52423e70bf362c9b69a1b3988028567712d48ca435e2dc298935e9805b068b3857a5529598488612fca0c3ac90bfba193acb SHA512 434706478702c8320f0989ac17d43ffa293fef27619b61f5e98615a5da1488164c631d0ad33ad7e3e7aaa10030566fc0d9427ef212540d67929574e6df1c0a16
-EBUILD radvd-2.19-r4.ebuild 1415 BLAKE2B c52bd5b963ea483836d43709d94d6ef4199f276a7521438a6311c8070b92ff716e25e3229cac0c63633109d5efa908a3febde4f9b77e356c1a7532e1a93e8732 SHA512 84e560c06c213c8b306cc3ea7db4d3c29917af058827b630806e9a69cff989a44698d685ff5217986cb808ddff00caa95e5b227b59c9eebf120a1a8c4a9ef4ce
+EBUILD radvd-2.19-r4.ebuild 1414 BLAKE2B 520291edd483159627f4b8175f73a16d59ce64489ef14ec3081e55775ed91fabe6b91726dd6262187d6fbbc21fa116b14d46b7269761ef01669b3e27bfc040fd SHA512 6defc383755fe3356841db13d0125ac4e78bf964c38d5b06f54128f11fca08feef4225153182982edbf92e2b08d36c21398ea404392306a06aa894e7395e8715
 EBUILD radvd-2.19-r5.ebuild 1576 BLAKE2B 1a6321542eda744efa030f0aeb00076bcccb425544b6570ee95f4ae9c4724e8f4223466bec7f54eb9487f8506c403f6aff823f7483ea95fe78641b2743af6c74 SHA512 ee4ccb82f2514c17de8718a77a9340c564abed0cbfca2a1e94a612a7d19250c1663296823b7532cbd2b56ca92554969cdb5508a08707240fc90bea136ccdd311
 MISC metadata.xml 417 BLAKE2B 7f94abef147b6a917da0c6d0070855bc54c121e0a6fbb54161e7e7de2ce0bf709de51fd3a5e834b52b2b19fbd544330266852788a810ee7f60a039a5c7c6fe14 SHA512 1402bb46da7074aa12c0154417b4d1aa3c887a3817281b59f8dcd3aa98708b30b2fa522c23d920afb4ff824753e7be2555ceb085ee72b967ff60249959c10476
diff --git a/net-misc/radvd/radvd-2.19-r4.ebuild b/net-misc/radvd/radvd-2.19-r4.ebuild
index a568472d4f89..c0f7f25a5faa 100644
--- a/net-misc/radvd/radvd-2.19-r4.ebuild
+++ b/net-misc/radvd/radvd-2.19-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://v6web.litech.org/radvd/dist/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 ~riscv sparc x86"
 IUSE="selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index 697f1a0bc5bb..a00436081314 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,5 +1,5 @@
 DIST rygel-0.40.4.tar.xz 1696492 BLAKE2B 9e22390b379b2e09abb2685b0c2a00bc03ae3668d4c6d5ed432dd9c5cefdf07a00370bc5a9a96bc542d14f48dfdcdf4db3647365833942d1d81dc377d0440705 SHA512 5e4003af9c0dc8a4b948cc63a12ec3f61c9e9f4f8007b196f9ce988c85e2fea7ec0a6c1e4217c59a770ca179b4ad8bba2e01aa99459a4e1179b9bc5db22ea0f8
 DIST rygel-0.42.0.tar.xz 1699676 BLAKE2B d3a324baba0b649c0b215e897a23cc963575c2c8b71f7f993fa4a544435a38c921115a5cc3c5ad1db45769d27db6d901a196210cbff540684b55b19aeb53aab1 SHA512 78dd253ad5f4e3dd5ac8db38f5f160a84878c868c445795e676b20e1cba2dd08e6b757f6473d6db5175dca4e9de4d7bb5143acc467cda2a5691e18c654c17dfa
 EBUILD rygel-0.40.4.ebuild 2194 BLAKE2B 858fc3d94a4c726820bfdbdc89f5275788938b10ec289d96dc80effeac1dd5df75b90ecbd921659325b71640e2af848dff3c8cadd1aa77242a55405cf7333b84 SHA512 cd6497f442f1b41a8a17790557c00269f2112ff64bb075bf3404cce6a60e029371936f879a87723c91a1b97a89edd25b845509ab87f6d508a680545b1ae8e6af
-EBUILD rygel-0.42.0.ebuild 2261 BLAKE2B 6cd63841d85cc527521c8ee4f6535cb9b83ac6033904afa89a0dd2e19e43ad9d970b512cf218642cf3bc00eab1f517878b933054b59a4ea4cb29b3909c4e815c SHA512 044d55504e46719b7861d22e8e958ff4a60f4224d2f436d0b5eeba85577b7e9b832294fc11bc1a4affa45930f26f549fb319d0cb84e4004913b666255c887f4d
+EBUILD rygel-0.42.0.ebuild 2267 BLAKE2B ae9a5e5225d54092d6aa6d0d77f7fc1d335c9e07ab347fc89201237c26dfc114b31fb95251cc0212394762712a6f1e0e8b35e4aba563b1c4badbda4448a3ae71 SHA512 82d60b2e52e068014a181e27327aad06ababc7805a81cb8a1f57da329035e7c3dabf1d0eb371c891b1aa6638e8f2199091cc2024d2711360ee8e03d5c1776402
 MISC metadata.xml 518 BLAKE2B 789b1e692571138dfd93f177e22ae1f86ed20a96652c31d5012b4e691b101408eb6162e401be9661f23b8239a304e854044485a8de6f2e1db7b8ecd1e801dabc SHA512 7f956f2a41c6de314dbfc2f3b17de68857474fcbfb4fc43f3019cc713d899ebbb17fcddc613bae43e441242f6e730ddb188cf09a40bd22080e665e6f32212a63
diff --git a/net-misc/rygel/rygel-0.42.0.ebuild b/net-misc/rygel/rygel-0.42.0.ebuild
index 6c38b36117a6..d8371018c1c1 100644
--- a/net-misc/rygel/rygel-0.42.0.ebuild
+++ b/net-misc/rygel/rygel-0.42.0.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 	>=net-libs/gssdp-1.5.0:1.6=[vala]
 	>=dev-libs/glib-2.62.0:2
 	>=dev-libs/libxml2-2.7:2
-	>=net-libs/gupnp-av-0.14.1:=
+	>=net-libs/gupnp-av-0.14.1:=[vala]
 	>=media-libs/gupnp-dlna-0.9.4:2.0=
 	>=net-libs/libsoup-3:3.0
 	sqlite? (