gentoo auto-resync : 01:04:2023 - 17:15:25

3 files changed, 14 insertions, 5 deletions

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index c6713e882ed8..5116d18f25cd 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -15,7 +15,7 @@ EBUILD llvm-14.0.6-r2.ebuild 12389 BLAKE2B 549b4e1c7feceb40c7e5aaa624925ec08627c
 EBUILD llvm-15.0.7.ebuild 12558 BLAKE2B 1f73f500a38ee4e96438a5e478781a562d48e10d550cd6c5beaf37a754ead1f0bedb121be78c6bee229f694cb085ee665f7b33a44eacba0d6eeaa42b545f6ca7 SHA512 92dd8f7f8554ee24978ef4e1409f5356a95455d2b5006da0a5dbf27cc277962916a0e93d2f7630a0eb3a9f3a1167eb9aeec0a319de3637c5762a7c391d3f5330
 EBUILD llvm-16.0.0.9999.ebuild 12399 BLAKE2B d18e5df615286b2e89b9b4c8eb8b79984c20cc5022545f713d92df70bf5f404edc380d5175dd767fcd7957653a5bd0ba5a3ed602c7d7f3c2dea0a06eda7f7a4e SHA512 c0af4a0925717b1d8783383b543425f558a249056d8424d71d441e365867c24d6a8b243632d4c4f9685242d4f1b671591448553c5dde5acea1563e02381aa3a5
 EBUILD llvm-16.0.0.ebuild 12490 BLAKE2B 95b6ae05f64728668134ff348e5d084346285425e57c69a7345a44f85c832523b1219a76c3b2c6274e190b869569be3f91d9e5c0298e13167f3e6e0e8d676f66 SHA512 eec238ccb340ad901e130d984349ee4a9788bec4cd7def73a6c946becd1b86b74ee044e39cda48f892017a06e2a381a0424caaf44d073a51c64625c3b45411ba
-EBUILD llvm-17.0.0.9999.ebuild 12572 BLAKE2B 8cb52862e845d3b05271be7a94d5c3a2d955959ccb5d4bda87ca152a37746ddc848060e1d69e79daa0a1a06d3da745baeda7301f6790aee39e66a9c92a01f1cb SHA512 d0b022959fcf70ca0ab5320b11ae55ababd302fa0e62afc13b3ba519620c26e12b922449008b5d8dd2d7dc397b9d39bc79787f5d10aa0bc55410db28c9a39a9c
+EBUILD llvm-17.0.0.9999.ebuild 12757 BLAKE2B 0f9e50da2e9a963ad952b87b2194a6b47ee97fe75eb8a660cd1bc2e0d2c1ce6b780cac0778abb2095b86a575a4f432ecb8cf7a533f297514cfb13bb34a2b5856 SHA512 f55bebe64915822516013e30a5fb911b1be967ca96931373ea7cbaed5e6fcaf3e593016848803c5d57c89ac9aa58a2ca1ce6fef0ac9bb9d3dfc1a0028e64426a
 EBUILD llvm-17.0.0_pre20230314.ebuild 12572 BLAKE2B 8cb52862e845d3b05271be7a94d5c3a2d955959ccb5d4bda87ca152a37746ddc848060e1d69e79daa0a1a06d3da745baeda7301f6790aee39e66a9c92a01f1cb SHA512 d0b022959fcf70ca0ab5320b11ae55ababd302fa0e62afc13b3ba519620c26e12b922449008b5d8dd2d7dc397b9d39bc79787f5d10aa0bc55410db28c9a39a9c
 EBUILD llvm-17.0.0_pre20230325.ebuild 12572 BLAKE2B 8cb52862e845d3b05271be7a94d5c3a2d955959ccb5d4bda87ca152a37746ddc848060e1d69e79daa0a1a06d3da745baeda7301f6790aee39e66a9c92a01f1cb SHA512 d0b022959fcf70ca0ab5320b11ae55ababd302fa0e62afc13b3ba519620c26e12b922449008b5d8dd2d7dc397b9d39bc79787f5d10aa0bc55410db28c9a39a9c
-MISC metadata.xml 2654 BLAKE2B c27983265b6c9b33200ee42565648f30a6cc9c51be53a1cb82a3353d7c1f7aa9c9501c58254280c2880ff2d4992b4834e4b5e2f1c9b1c60e9b21945f234b9973 SHA512 b331d9186908762907f5713b00e357785b62afbee83afefac8701beb1a20f7ebd68df4a030bb82c6f9164719d4ccfcaf16c189833ad40e9f5900c36247d9cff2
+MISC metadata.xml 2782 BLAKE2B 4bd546287f630462c3f5d98cbd15a59a4cdef4023f86a5f4fe64fc5f10256cae7014d18823bd0909f4af4e42f299b6e7983c9c3c569cfab1ad38b0160f1eae40 SHA512 6bf1dc4f71f50e1eecc55cbb8366d8ed82a3dd328871acf1d808fc5e3ee4d203d623f81d9968bda45a87c72a2f20ed69b735b0a289b0052b048175cf6502e124
diff --git a/sys-devel/llvm/llvm-17.0.0.9999.ebuild b/sys-devel/llvm/llvm-17.0.0.9999.ebuild
index f7e501b7f98e..94ec3e2b1216 100644
--- a/sys-devel/llvm/llvm-17.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-17.0.0.9999.ebuild
@@ -20,13 +20,17 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
 KEYWORDS=""
 IUSE="
-	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
-	xml z3 zstd
+	+binutils-plugin debug debuginfod doc exegesis libedit +libffi
+	ncurses test xar xml z3 zstd
 "
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	debuginfod? (
+		net-misc/curl:=
+		dev-cpp/cpp-httplib:=
+	)
 	exegesis? ( dev-libs/libpfm:= )
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
 	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
@@ -245,7 +249,6 @@ get_distribution_components() {
 			llvm-cxxfilt
 			llvm-cxxmap
 			llvm-debuginfo-analyzer
-			llvm-debuginfod
 			llvm-debuginfod-find
 			llvm-diff
 			llvm-dis
@@ -326,6 +329,9 @@ get_distribution_components() {
 		use binutils-plugin && out+=(
 			LLVMgold
 		)
+		use debuginfod && out+=(
+			llvm-debuginfod
+		)
 	fi
 
 	printf "%s${sep}" "${out[@]}"
@@ -372,6 +378,8 @@ multilib_src_configure() {
 		-DLLVM_ENABLE_RTTI=ON
 		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
 		-DLLVM_ENABLE_ZSTD=$(usex zstd)
+		-DLLVM_ENABLE_CURL=$(usex debuginfod)
+		-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
 
 		-DLLVM_HOST_TRIPLE="${CHOST}"
 
diff --git a/sys-devel/llvm/metadata.xml b/sys-devel/llvm/metadata.xml
index 084e1821104b..d9ba661926c8 100644
--- a/sys-devel/llvm/metadata.xml
+++ b/sys-devel/llvm/metadata.xml
@@ -11,6 +11,7 @@
 	4. LLVM does not imply things that you would expect from a high-level virtual machine. It does not require garbage collection or run-time code generation (In fact, LLVM makes a great static compiler!). Note that optional LLVM components can be used to build high-level virtual machines and other systems that need these services.</longdescription>
 	<use>
 		<flag name="binutils-plugin">Build the binutils plugin</flag>
+		<flag name="debuginfod">Install llvm-debuginfod (requires <pkg>net-misc/curl</pkg> and <pkg>dev-cpp/cpp-httplib</pkg>)</flag>
 		<flag name="doc">Build and install the HTML documentation and regenerate the man pages</flag>
 		<flag name="exegesis">Enable performance counter support for llvm-exegesis tool
 			that can be used to measure host machine instruction characteristics</flag>