gentoo auto-resync : 10:11:2024 - 23:18:27

3 files changed, 34 insertions, 22 deletions

diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 8ec4eccf7653..47ddec39d0ff 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -6,6 +6,7 @@ AUX clazy-1.11-jobs-for-tests.patch 1626 BLAKE2B 58d8c059fa631c2c534e6ec2c33268a
 AUX clazy-1.12-INCLUDE_DIRS.patch 1615 BLAKE2B 2e1d0898d12fe58f11e4286d56085a6b608e338ec0095c642e7b551d84269ca8d1e244f7dc88c95d3b264434b3724e0999fe9396525ae83c4e3f9740ab3163cb SHA512 86305b07f6099d135a1a397bd20b7dba5f51d3b9971cd63886306077b873d410b108baad2c9b21e2470a0bfaa66e2fe1a40ff37162713bdfea43fb259ed83e56
 AUX clazy-1.12-LIBRARY_DIRS.patch 1161 BLAKE2B 6210b53e9219042c79605f84598dd9e34bd2b0ebb99987ca6a34ab53e76553befdbe413d53bf213a5e095b2939c40e6664cb7ae9ef135a1f56bb117c79c0cd57 SHA512 804abd9e01b6f4e36849e062dae8b36863abc0710a2c245aa7043a3295bded0bbcbee4fcec64a9c63ae2973f520a5c1f79d81322c4c68f41e1b3d1840e619bf2
 AUX clazy-1.12-clang-16-no-src-root.patch 2167 BLAKE2B 84f2cd26abea61998f4e78cb325126bd61b539924bbb1140793b888db8c80b891afb21700472a8d44d0c37e6da613350be570802ceffcd342463854bcd45af6f SHA512 da93e8320184f832c20f390d9b77a9829972cb9d95ca801d072efc41fc88fd584fc423a000c40621f86040fe5a9d3468382f390a7b525b4677a1e7163004d466
+AUX clazy-1.12-clazy-install-location.patch 1157 BLAKE2B 05bb8f3167174a073deddc9501f5e120ef3e44863a989e1ffda537610385035706804bd345165c51dad36f665d92258e9462fc4ac8bafb0eb91fada86a2808f6 SHA512 fe0e8765b54dfae606d6613a4dd9f638cd0d665d4b7ab24433fa7aa82059c20eb574978f1f116414955e8a84160d76445abb51ec8ab66b901f11f30207ae4cc4
 AUX clazy-1.12-fix-tests-Qt-detect-1.patch 3388 BLAKE2B 4aace0f453e84a3e00651eda4a30dc1b84032789d22a7cedd1eee7338d5f52f49f03e0e92a1220de187ad90e9a3cf9ab14c8f5e1f57559d8a385f3bd705a771b SHA512 926a8fbfd7134b9e1b553273e39817cb35d5e6b5d29ed43b77b5eedef9faa6d9cde7441923d5bf6eaf2b19b2d7c7a97b23ae866ff1b8b5e3a02754a2234183f6
 AUX clazy-1.12-fix-tests-Qt-detect-2.patch 5164 BLAKE2B 7ce4d58f5ca52df4ce229c7892cec13754e557000e755f7f3954b7810aacad3e5d001e0ea90422191c5869b954387cb22baff2e485666e9f0ef2803819587a4c SHA512 3b84aa5f407402a4abef33090f2efc60cc8dca47f0f2324c61f825b674023080ec9c4d693aed451642c80dd38759ef8bca942faff6dad7d6bc79aa1be4515a14
 AUX clazy-1.12-llvm-18.patch 1532 BLAKE2B 6527759799a8e99db6c996177f2f4ed9b1fd5f2327b2a950db6138c2bc4dd6c0b8f2d06bc45668836b8a6fc406df0973f9b3f5218361f2d401b7180cb824e308 SHA512 b0666907bb4d023e605b2b8ce4fd9addaa477e87a811d38bdb68c03bdf4a45d52fabb191e300cf3f877eb32189e23b23046c702c11e50527b474d79e4695c2de
@@ -13,5 +14,5 @@ AUX clazy-1.12-standalone-install-location.patch 1728 BLAKE2B 9ef38ca69289f76721
 DIST clazy-1.11.tar.xz 404088 BLAKE2B 1a69fe07ef81a0efe3c9db9129083247d60943592967f705d62d3859039cec250673eecc06184f70d134cbab85708d957b0a085beff8b3e46325a69547e005b7 SHA512 6a7c162392dd30aea29669275cea814d6daccf7931b8cdb20997f9bbff5619832d5461a6d0f854ecbc4726e52b6937c4f9cb8651087ffe73676c04239a38ca2b
 DIST clazy-1.12.tar.xz 427740 BLAKE2B ad2c78a506132b5fd6b3c22a7e9794c38ddd71242cde6f760e48d0250f6215629007d45303f4b35fdc7717865b8221ab1c2f3c6889a44ea1809e112845f16463 SHA512 7a2b4a753098f15936a4731c82c660c1cd4d81949279435e87f00f7f72bef3e32cb574c8991c0707798581278e9fbcae34d354c1e6b77a15a5e26166d658fa9e
 EBUILD clazy-1.11-r4.ebuild 1312 BLAKE2B 5ff282ba38629cdd15ea65c1837d798563ac6ef396f771c6d91058c3e0f82ffab4e69b2ca7842afc96514b89b49c23f4aac291d6c186bdc285510500e87e063f SHA512 7c6e9aee3960b00e778455fd9832b41d845beaff25e1fb9c0959168598c3162a93c3592164533ea9183d782b5ebcfa54a4ffbab28544e69318628d0e62cd460f
-EBUILD clazy-1.12.ebuild 2646 BLAKE2B 7d98300ecd1cd198da1f304c1dd839e0dbc8f144673bf8b20d2d60f8ff70d18cff2be608f2a5db8bb9fafe4cde3cd663763cbaaa3397d1cf25957215e68df734 SHA512 29da74cce8fac24adf2c1a4529dc2e6d4079d43ee75b0cc036f5838fa181cae5de50416e6c5412b11a1661126a110b869309a537b1d4a4439b740ab8a22454d1
+EBUILD clazy-1.12.ebuild 2238 BLAKE2B f45d19e66587b9e185d18c7332288fe3f397309fafe37001440ab5574102c3e6cd708315e534c96278265e27e3c512a65445043f393e92c06f1d50e7c153bc4f SHA512 eb773cc29dc4bac144de73ca20b263f2550a952d1865f2a8f0d7f402695cfe62c2054baaae4d8aebb3f2f7eb8b2bbaa0840aa70d793054ec6b957804e1293a6a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/clazy/clazy-1.12.ebuild b/dev-util/clazy/clazy-1.12.ebuild
index a04372e51041..a2e4a824b8d5 100644
--- a/dev-util/clazy/clazy-1.12.ebuild
+++ b/dev-util/clazy/clazy-1.12.ebuild
@@ -25,7 +25,11 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	test? (
 		${PYTHON_DEPS}
+		dev-qt/qtbase:6[network,xml]
+		dev-qt/qtmultimedia:6
 		dev-qt/qtnetworkauth:6
+		dev-qt/qtscxml:6[qml]
+		dev-qt/qtsvg:6
 	)
 "
 
@@ -39,6 +43,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-LIBRARY_DIRS.patch
 	"${FILESDIR}"/${P}-INCLUDE_DIRS.patch
 	"${FILESDIR}"/${P}-standalone-install-location.patch
+	"${FILESDIR}"/${P}-clazy-install-location.patch
 )
 
 pkg_setup() {
@@ -74,29 +79,10 @@ src_test() {
 
 	# Run tests against built copy, not installed
 	# bug #811723
-	local -x PATH="${BUILD_DIR}/${LLVM_ROOT}/bin:${BUILD_DIR}/bin:${BUILD_DIR}:${PATH}"
+	local -x PATH="${BUILD_DIR}/${LLVM_ROOT}/bin:${BUILD_DIR}/bin:${PATH}"
 	local -x LD_LIBRARY_PATH="${BUILD_DIR}/lib"
 
-	# NOTE or DEPEND on "test? ( dev-qt/qtscxml:6[qml] )"
-	local -x CMAKE_SKIP_TESTS=()
-
-	chmod +x "${BUILD_DIR}"/clazy || die
-
-	if ! has_version dev-qt/qtscxml:6; then
-		CMAKE_SKIP_TESTS+=(
-			# cannot find -lQt6StateMachine: No such file or directory
-			"old-style-connect"
-		)
-	fi
-
-	if ! has_version dev-qt/qtdeclarative:6; then
-		CMAKE_SKIP_TESTS+=(
-			# lowercase-qml-type-name/main.cpp:3:10: fatal error: 'QtQml/QQmlEngine' file not found
-			"lowercase-qml-type-name"
-			# no-module-include/main.cpp:5:10: fatal error: 'QtQml/QtQml' file not found
-			"no-module-include"
-		)
-	fi
+	chmod +x "${BUILD_DIR}/bin/clazy" || die
 
 	cmake_src_test
 }
diff --git a/dev-util/clazy/files/clazy-1.12-clazy-install-location.patch b/dev-util/clazy/files/clazy-1.12-clazy-install-location.patch
new file mode 100644
index 000000000000..651dcf282b08
--- /dev/null
+++ b/dev-util/clazy/files/clazy-1.12-clazy-install-location.patch
@@ -0,0 +1,25 @@
+From b5600e28b0720a9a43d20717e79ba26dae6b9359 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Sun, 10 Nov 2024 22:22:07 +0100
+Subject: [PATCH] move clazy script to CMAKE_RUNTIME_OUTPUT_DIRECTORY
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 765083c..c7c1cea 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -229,8 +229,8 @@ if (NOT CLAZY_BUILD_WITH_CLANG)
+     endif()
+     file(RELATIVE_PATH BIN_RELATIVE_LIBDIR "${CMAKE_INSTALL_FULL_BINDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}")
+     file(RELATIVE_PATH BIN_RELATIVE_SHAREDIR "${CMAKE_INSTALL_FULL_BINDIR}" "${CMAKE_INSTALL_FULL_DATAROOTDIR}")
+-    configure_file(${CMAKE_CURRENT_LIST_DIR}/clazy.cmake ${CMAKE_BINARY_DIR}/clazy @ONLY)
+-    install(PROGRAMS ${CMAKE_BINARY_DIR}/clazy DESTINATION bin)
++    configure_file(${CMAKE_CURRENT_LIST_DIR}/clazy.cmake ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/clazy @ONLY)
++    install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/clazy DESTINATION bin)
+   else()
+     install(PROGRAMS ${CMAKE_CURRENT_LIST_DIR}/clazy.bat DESTINATION ${CMAKE_INSTALL_BINDIR})
+     if(MSVC)
+-- 
+2.47.0
+