gentoo auto-resync : 10:05:2024 - 00:01:13

3 files changed, 47 insertions, 6 deletions

diff --git a/sys-apps/azure-nvme-utils/Manifest b/sys-apps/azure-nvme-utils/Manifest
index b9b867de5c40..3563305b633f 100644
--- a/sys-apps/azure-nvme-utils/Manifest
+++ b/sys-apps/azure-nvme-utils/Manifest
@@ -1,3 +1,4 @@
-DIST azure-nvme-utils-0.1.2_p20240502.tar.gz 11362 BLAKE2B 593a1670af3d01e400afb4cf21e9cb3a6456da3ad7914d020462fb50950a8e6d8255ad14fcb8708d44f55f3170a72f824e0fae942a560bf69c6d9770c4da1d2b SHA512 e4d0f3a400e16dc119b1562ec2abfb1e520ef58de46a36fccd4fd9db773c95ad218cc38a406cb644188ca6c66c7e84292cbcae3dad5f1e4b2c3ae0b24aa5077d
-EBUILD azure-nvme-utils-0.1.2_p20240502.ebuild 826 BLAKE2B e6215a08a92124915815008d11284a3766315492addee6c572dacff0de4be3a6f28d6fdc805f9e4b60e8f191be96b20c5446928c22bd878dc2d0b6a6d8697def SHA512 5f8121f8561e839cc3dbe5ef5b2dbc68fac2a402052d3136a6ff2b07121723058e98254d21a82aee32729557e48da15f514985fab85dd04a8cde39dfa14cbef0
+AUX azure-nvme-utils-werror.patch 1077 BLAKE2B ee0a9778769c88478b04db6c45c2812077b96949f48df87ff146a429feb54c41fe08037de04beeb303fb197ce2b6b5f63eeae4bfa7916e4edd49cd26e71f2eca SHA512 5de7ebbe04eb5233f7b9d458d93a6763cb8755fa70ebff37462febf18c59afe75ad05987e0dd9abab8cd62732ba8a3f5df263a3f783e326b586692e086c913fd
+DIST azure-nvme-utils-0.1.3.tar.gz 11365 BLAKE2B 97b040a6cdacdd1e8eede89b16722a8e870c6027f0318ce0700ce4087f93fb2df7b25ab3154567548a1704cd9585a4f0cda3cf2bdde408990a715b96639225b4 SHA512 42b6ada9ec2db9d53e4b7f9b4a4dc581a06af2954c0da94a5851ed88b66cc2d349c3b6b3a7d4bcf73a68094620df4cd9d480dde31edaf9b80d5235129b634fa8
+EBUILD azure-nvme-utils-0.1.3.ebuild 784 BLAKE2B dff5ccddcc75db64bde82d781f69d237ab03445f9bcbe4470ebaed5a989c68305f236a409546a63f86c80e711a5e2d75ceaf2d2890f398f99ff0090b81f4d41b SHA512 dd425d221ac713263d5db216f08ecb68c1232e72452ef2f140d8d26bee4f0ad2f7e2be237981d9b96d75c4e8071164b60e73b1cc39ba2b155bcc026777b1c185
 MISC metadata.xml 426 BLAKE2B 24ec8a7528b7d42d8b9b704ed26572cd5171914a588f7665d881723a82cb3ba5eed5543c3ff376f65fb9e1bd0abc641eef2cfc078812d36ca43e1a82c509ece3 SHA512 9ff643547af48d07106069966935403b31ab5259009bcd3e9609cec2a5a1e8d05b931acdfb2c0a42fb5068d934f709b769dbc838b762199071c81deaeb320164
diff --git a/sys-apps/azure-nvme-utils/azure-nvme-utils-0.1.2_p20240502.ebuild b/sys-apps/azure-nvme-utils/azure-nvme-utils-0.1.3.ebuild
index b7583d7e80d4..0eaa5b559aab 100644
--- a/sys-apps/azure-nvme-utils/azure-nvme-utils-0.1.2_p20240502.ebuild
+++ b/sys-apps/azure-nvme-utils/azure-nvme-utils-0.1.3.ebuild
@@ -5,12 +5,9 @@ EAPI=8
 
 inherit cmake udev
 
-COMMIT="cbf8c65d0d792b7dfc02dcaa55d5ec3077464ee6"
 DESCRIPTION="Utility to help identify Azure NVMe devices"
 HOMEPAGE="https://github.com/Azure/azure-nvme-utils"
-#SRC_URI="https://github.com/Azure/${PN}/archive/refs/tags/v${PV}/${P}.tar.gz"
-SRC_URI="https://github.com/Azure/${PN}/archive/${COMMIT}/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
+SRC_URI="https://github.com/Azure/${PN}/archive/refs/tags/v${PV}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -20,6 +17,10 @@ BDEPEND="
 	doc? ( app-text/pandoc )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-werror.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DAZURE_LUN_CALCULATION_BY_NSID_ENABLED=$(usex lun-fallback)
@@ -28,3 +29,11 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-apps/azure-nvme-utils/files/azure-nvme-utils-werror.patch b/sys-apps/azure-nvme-utils/files/azure-nvme-utils-werror.patch
new file mode 100644
index 000000000000..928dcb099e4e
--- /dev/null
+++ b/sys-apps/azure-nvme-utils/files/azure-nvme-utils-werror.patch
@@ -0,0 +1,31 @@
+From d4afc19a9432e1b7c25269732d18143263f87404 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <jlecuirot@microsoft.com>
+Date: Fri, 3 May 2024 12:52:04 +0100
+Subject: [PATCH] cmake: Only enable -Werror for debug builds
+
+-Werror is very unhelpful for distributions and end users as different
+(usually newer) compilers will raise warnings that the maintainers may
+not see. The warnings should get reported upstream, but they shouldn't
+block users from using the software.
+
+Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3d3cd4b..75db578 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,7 +17,7 @@ include(cmake/doc.cmake)
+ include(CTest)
+ enable_testing()
+ 
+-add_compile_options(-Wextra -Wall -Werror -std=gnu11 -D_GNU_SOURCE=1)
++add_compile_options(-Wextra -Wall $<$<CONFIG:Debug>:-Werror> -std=gnu11 -D_GNU_SOURCE=1)
+ add_executable(azure-nvme-id src/main.c)
+ 
+ set(AZURE_NVME_ID_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/sbin")
+-- 
+2.44.0
+