gentoo auto-resync : 17:09:2024 - 12:11:34

7 files changed, 12 insertions, 13 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index fde406703a4e..a7b30fa530a7 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/azure-nvme-utils/Manifest b/sys-apps/azure-nvme-utils/Manifest
deleted file mode 100644
index 1e93391f9be5..000000000000
--- a/sys-apps/azure-nvme-utils/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST azure-nvme-utils-0.2.0.tar.gz 13177 BLAKE2B 5c486d035422ea6547e2886324e0b6e2537d11089bc0b3dfd550130e82ab8de8cc9a5be8e3bfd0722cb71c17a66c261f0cfd021e4a48e5568de01dd0c052fbbc SHA512 4ef2de641839bfbcc2e1a084cec218d1105550366770d731bb7a3e5d4b4e45a47b21ccf9a3a8069f469389e1d27e485bfed235a55d398930bddc8829eebc2708
-EBUILD azure-nvme-utils-0.2.0.ebuild 636 BLAKE2B ccbd63b59ba17366f2f8090b0426c661cb9d606841c140b83d5d0cf763a335433fb5deeb375d1b235ae79431acb9e21cdeff3185c097def5af8f4056b4facf94 SHA512 fa8ca6d31cd8c898fc96b4cdd707f65cb519fa99acd9aa8775674f1b1746e338e53d3e020ba35c89d75ff0589c03877caaebf42ef92a175def09259d4ef627d0
-MISC metadata.xml 426 BLAKE2B 24ec8a7528b7d42d8b9b704ed26572cd5171914a588f7665d881723a82cb3ba5eed5543c3ff376f65fb9e1bd0abc641eef2cfc078812d36ca43e1a82c509ece3 SHA512 9ff643547af48d07106069966935403b31ab5259009bcd3e9609cec2a5a1e8d05b931acdfb2c0a42fb5068d934f709b769dbc838b762199071c81deaeb320164
diff --git a/sys-apps/azure-vm-utils/Manifest b/sys-apps/azure-vm-utils/Manifest
new file mode 100644
index 000000000000..9b97504d8927
--- /dev/null
+++ b/sys-apps/azure-vm-utils/Manifest
@@ -0,0 +1,3 @@
+DIST azure-vm-utils-0.3.0.tar.gz 15680 BLAKE2B b739299bda66dd594172e95ae0fe99155d1c101af4e20a012ce5dce658ee0648f802b5c4ec199d76bd650967abac763fea81a2e0202168fc74cd92fd25900956 SHA512 00eb9b0781f5070a35e921ee58d691cf4d530c695e6673fcb24fefbfefc9d869e0ccfab213dbb5ea78d2f93ef829aded3de1c411ccd24b03e52e564895bb2ed8
+EBUILD azure-vm-utils-0.3.0.ebuild 557 BLAKE2B 05d3060bc73f45b671e5255c9337b931cf120c99e917beaa0b0e7c2e6cc0faeb788d5f56bfbd689e89d92bc34155a6cc7491e6dbe5dd2b3837028e5d601425ce SHA512 44346360e36512ce5cec466b348ff3fc7e94ace8c2e1288b24eb7b6a4b06cd92adcf75ccd50c1ceb28319e68a9aceae1122601900ae5537339fc8538c083576d
+MISC metadata.xml 333 BLAKE2B 458730ed0d783a63c9e2a51a8b667f598cfeddccf8fcf8bb9cf896d3250b853c94736e9a359939bf698dc643e2a0faf57c8bb4e48eacd0db3aa664cefa7e2e63 SHA512 00171f744549392367c36ca8c6235396c675192bcc342b6bf56bdfae521e3fd5554aa6ed481407a8cd28970959e4c7312a3f76c0ef78df07ea08966b62d1454c
diff --git a/sys-apps/azure-nvme-utils/azure-nvme-utils-0.2.0.ebuild b/sys-apps/azure-vm-utils/azure-vm-utils-0.3.0.ebuild
index 5d3421905581..e01cb1035d2f 100644
--- a/sys-apps/azure-nvme-utils/azure-nvme-utils-0.2.0.ebuild
+++ b/sys-apps/azure-vm-utils/azure-vm-utils-0.3.0.ebuild
@@ -5,17 +5,15 @@ EAPI=8
 
 inherit cmake udev
 
-DESCRIPTION="Utility to help identify Azure NVMe devices"
-HOMEPAGE="https://github.com/Azure/azure-nvme-utils"
+DESCRIPTION="Utilities and udev rules to support Linux on Azure"
+HOMEPAGE="https://github.com/Azure/azure-vm-utils"
 SRC_URI="https://github.com/Azure/${PN}/archive/refs/tags/v${PV}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
-IUSE="+lun-fallback"
 
 src_configure() {
 	local mycmakeargs=(
-		-DAZURE_LUN_CALCULATION_BY_NSID_ENABLED=$(usex lun-fallback)
 		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
 	)
 	cmake_src_configure
diff --git a/sys-apps/azure-nvme-utils/metadata.xml b/sys-apps/azure-vm-utils/metadata.xml
index f6dc52150140..f50058d0766e 100644
--- a/sys-apps/azure-nvme-utils/metadata.xml
+++ b/sys-apps/azure-vm-utils/metadata.xml
@@ -6,9 +6,6 @@
 		<name>James Le Cuirot</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">Azure/azure-nvme-utils</remote-id>
+		<remote-id type="github">Azure/azure-vm-utils</remote-id>
 	</upstream>
-	<use>
-		<flag name="lun-fallback">Enable fallback LUN calculation via NSID</flag>
-	</use>
 </pkgmetadata>
diff --git a/sys-apps/netkit-base/Manifest b/sys-apps/netkit-base/Manifest
index 7b91a660986b..c640ae8a23c1 100644
--- a/sys-apps/netkit-base/Manifest
+++ b/sys-apps/netkit-base/Manifest
@@ -3,5 +3,5 @@ AUX 004_all_netkit-base-0.17-misc-fixes.patch 1601 BLAKE2B 64cdad3fcb0ef6fb8bb7e
 AUX 005_all_netkit-base-0.17-no-rpc.patch 522 BLAKE2B 8935847c79c032dee03f0f99edf6fd879ba224b96a90b144305351e5cedf51e705e2c881bdcd16174ab32fa88eeaf01cc6c9bd326043b7274090b090a6373c11 SHA512 0dff7bb005c1d480444b8ff61f53626ed0a5748730c2a1ff489a277a1bbd61e08bd9c46261acc040f5030d7048a291fa5f22cb7b1a58bb468d8264d4b6272d0b
 AUX inetd.rc6 470 BLAKE2B 5f6fe30c6a3d07162194f9fb756bcd3748470200819733b291ca59612bdb9f2125bc2003b6c82ec5ed459bea43a29c5a69c20ceadcc90679f151759af2643cba SHA512 525f4f948721553f051a929d5c6b7c49208256170c423ac10ad49427cc89fdc19dbadf81e7a3d8eed07c54c5a266e73cb0ac24c8f95f60f731fab571ccbbd5d2
 DIST netkit-base-0.17.tar.gz 56473 BLAKE2B a84289eb56762c702ffe52bec634df1b36dee382dc46d2356886f0fe0039d8f7c393ac0a22f137d1d220222ff55429b25fb4da666c7e6d7f857dbb7dec54e2be SHA512 2faae6471251647ea0d499c96d13faf72bc9aa4ab408f9f7f4c9fc41b1e1e2ce0bcad626ca027135b5a20f311362e90af57c7197885d02a0839beea5b4fdb821
-EBUILD netkit-base-0.17-r9.ebuild 1123 BLAKE2B d799e2d05dd862ab1b77acaa485c89db838795b6a6dc20adf824cb776b21ae20b79320058374fe41790d3ea7255c862f3d91b469f22ae5f66b2c800514148a33 SHA512 941a4bde1e477e28c1bbe37cfdb79e4ef7c2855d768e0fc70d070823198b2719c4a7f1c410400c7be8f98541ac40f0ba43cf9517d5038b59beb5c518768f1fe1
+EBUILD netkit-base-0.17-r10.ebuild 1164 BLAKE2B 2af7d5dab2bc5b2c25249614499cf266b9f97857ee8d2a2656ac4f374df21506921e658349794515006910f4540f39f46c06f4ad4c8bb2f95782a1aa036d5fae SHA512 a644ad68813b05dbccb4f4cfacf4f2b196c796bc1d64abbdc7edf6bb11c57afb6eb46f15808bcded930e69cfcc697d34269adf3e8a3b7ddeb89396724cbb9162
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r10.ebuild
index c9c77170e7e0..2051ac7abf3c 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86"
 
+RDEPEND="
+	!net-misc/inetutils[inetd]
+"
+
 PATCHES=(
 	"${FILESDIR}"/003_all_netkit-base-0.17-gcc4.patch
 	"${FILESDIR}"/004_all_netkit-base-0.17-misc-fixes.patch