gentoo auto-resync : 25:12:2023 - 01:35:27

4 files changed, 42 insertions, 20 deletions

diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 527853f08c65..1b6432f0a688 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,8 +1,8 @@
-DIST libdrm-2.4.116.tar.xz 473560 BLAKE2B da393845a5af3aaf01592d1b56fcada587feed57fa48159d48c2b1f6aba36cc8cad22e0431a127cce92c15c006b97be59fe1895bb27f3d5b06c550ca40f45177 SHA512 1287d1896deeb8cfb4532c6750eb43493dcefbfaaa598a73bbb682aa749594eaad3ed1fa2fe73d06280350f365a92a0c20cad8be76f3da2ed59b04aa008de911
 DIST libdrm-2.4.117.tar.xz 475504 BLAKE2B cbda61815b1e5c3a5de285a9abe7f78669093d8b0f0f9f51cd38ea3b710e049de62d4f2591748f2000a1eb231d7b339a0ac7990934a9ccbfda62c6586c5b8236 SHA512 326cf565548fb9d50a321562c13acb2a2f5ad5915ffdc2b08ef812fbac887f5b3d271cb2ce8c483633edddf2c55064d55810ff6697f713c179e2d0c8048eb544
 DIST libdrm-2.4.118.tar.xz 479096 BLAKE2B 064e0c7fc1b84bb7cbe2bfe9b22b2a48d266637cbfdd5b72fa44c0c0981a212e2de7ebc42ddd1da5f06e621bc3e0d2a6d329c74ba14154e6c9e7ddf429cd8f04 SHA512 2740ec10dfe96b520345c3f6f0d99a30aac95b1f96656bd9cd11269c2a83a9dac423da29d74a3deb55360e3ae2ca4a1de283e1e443667bedd22673f6629c9920
-EBUILD libdrm-2.4.116.ebuild 2035 BLAKE2B db52fff40d25e51e99eb5d80090201f32ea4575ec2a8d3c80c9fa1c7377a9737dd52430eb00fa59d9880a82aa3317e30cd78c27cbd3b7db55e512b6ed39ba21d SHA512 e7b5189467cb8ab6b7d25417bf5bba2d08e7a39991dd5ace75052d06a72993088f023036fe98d3a54bf2e70fcefe82314028008b82e24792e83e23d14909b1b0
+DIST libdrm-2.4.119.tar.xz 479108 BLAKE2B 05c6a06bf497e9140a8f8c3d2fa5f5d4ef3ed7e392a86f4af433b83b670e68aefe1c06e6bcf071c1c6a2339442376b7e16c081000025d91e661e284b9d77f8db SHA512 c8dd7665e85c01a67fcce1c1c614bc05a3ec311f31cae7de5fb1cd27d0f11f1801be63de3fa3e33b2f505544fd4b1bc292965c5e8de46a3beaaedb10334945ca
 EBUILD libdrm-2.4.117.ebuild 2019 BLAKE2B 68c26649934a7bf7f5dcd793af09e41fac6210043f01e4dccd2e4d85c94653c6eb02d7bd4f3f4c0aae99f3cb11d49251dcf254c9e5f07fff6ab995ec75ca1af7 SHA512 1dda633fea73c4eb3b41200ee90ee93081124facf1168b94f114994435e50eecd36c5374c1bc3130aa7dbf3c3ae2f14526df166fb334ad18065f7ef5be7a7b37
 EBUILD libdrm-2.4.118.ebuild 2027 BLAKE2B 25f88530172eb971c502f6c4e0cb9ad456a2bcc2b2907278011521b028b9cb6357137c62c27ee81393b18f9dbf6583cea1e60f8f38278c1047be61397eff8a4f SHA512 d175ceb6540f87a4a7e8dbd7e0ad2183a5af0a83973d3653523db2b1a4431c2a5f0342b7a43b522492ac236fefefc3fdb7e9e08b7f363f8c92b457fc1ba98953
-EBUILD libdrm-9999.ebuild 2064 BLAKE2B a4c5f24847bc9f84347c00121264d110ba7380e00d47d1ed6a23c47e6e03319548fc068616357f37ea73ba23478c166ebda43be2ad2194be2f06824667a5ffaf SHA512 f798ad463113c75ef5d37831796a2a120bdc53758c745c6df3570f4b421b29b95521e62b4ee90ae4aa3c19fb8891b93c7956f6e991a88b624b4387bfba7c8812
-MISC metadata.xml 330 BLAKE2B cffaa78a15d94e0bd3e1b3b58c5411f1c733358845df30772bfb6e32bd55e9139250e28203f06f886c1678469f227e390f238d1d0dae7b6bac5bcf25f80f3adc SHA512 f688c7d40f10f4c239a888c3587245d59358e7983feb336c2fe764f85560b2f012232c361f719010424c85b164f45a21e8139267211cf32dea94a1e64780d717
+EBUILD libdrm-2.4.119.ebuild 2317 BLAKE2B 7cb60320475e1a10c0d9d1ac6cbab077ca4b8e5e44cd4891b6241a123c7ffca8958e552d114701eedbc29628c0356d0986e0c0ec99e2fd8551424b4687260ca9 SHA512 d7f111d586d76ae5ce7b18a0d32e2ac0fef02de5c885a55fb1d074f1ebf579cdafc3e85b4af01b24f89ec3bbc348d59acab893434a3529392bcc9c3464a3e956
+EBUILD libdrm-9999.ebuild 2317 BLAKE2B 7cb60320475e1a10c0d9d1ac6cbab077ca4b8e5e44cd4891b6241a123c7ffca8958e552d114701eedbc29628c0356d0986e0c0ec99e2fd8551424b4687260ca9 SHA512 d7f111d586d76ae5ce7b18a0d32e2ac0fef02de5c885a55fb1d074f1ebf579cdafc3e85b4af01b24f89ec3bbc348d59acab893434a3529392bcc9c3464a3e956
+MISC metadata.xml 410 BLAKE2B 86cda23d38e7b6f3581545fcd036c4d6233380e3a61b3ad8a94b8fef4eb8ae3f3a9bd4680b0cac219c0decd4c2df58bf731fce668787b0b3bf7d88f054110a8d SHA512 5c10acae8f229f49f789c0447988a4a48cb2f7de996b9d0a68fe67c0a217d405bc4face3be503562210da7f480a17aebd64d6ae9b38d8d2ff2dc031c41b438d5
diff --git a/x11-libs/libdrm/libdrm-2.4.116.ebuild b/x11-libs/libdrm/libdrm-2.4.119.ebuild
index 9bc0207342d8..6ffff813ee27 100644
--- a/x11-libs/libdrm/libdrm-2.4.116.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.119.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -14,11 +14,9 @@ inherit ${GIT_ECLASS} python-any-r1 meson-multilib
 
 DESCRIPTION="X.Org libdrm library"
 HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
+if [[ ${PV} != 9999* ]]; then
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
@@ -26,15 +24,21 @@ for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
 
-IUSE="${IUSE_VIDEO_CARDS} valgrind"
-RESTRICT="test" # see bug #236845
+IUSE="${IUSE_VIDEO_CARDS} test tools udev valgrind"
+RESTRICT="!test? ( test )"
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="
+COMMON_DEPEND="
 	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	valgrind? ( dev-util/valgrind )"
+RDEPEND="${COMMON_DEPEND}
+	video_cards_amdgpu? (
+		tools? ( >=dev-util/cunit-2.1 )
+		test?  ( >=dev-util/cunit-2.1 )
+	)
+	udev? ( virtual/udev )"
 BDEPEND="${PYTHON_DEPS}
 	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
 
@@ -44,8 +48,7 @@ python_check_deps() {
 
 multilib_src_configure() {
 	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
+		$(meson_use udev)
 		-Dcairo-tests=disabled
 		$(meson_feature video_cards_amdgpu amdgpu)
 		$(meson_feature video_cards_exynos exynos)
@@ -60,7 +63,13 @@ multilib_src_configure() {
 		$(meson_feature video_cards_vmware vmwgfx)
 		# valgrind installs its .pc file to the pkgconfig for the primary arch
 		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dtests=false # Tests are restricted
+		$(meson_native_use_bool tools install-test-programs)
 	)
+
+	if use test || { multilib_is_native_abi && use tools; }; then
+		emesonargs+=( -Dtests=true  )
+	else
+		emesonargs+=( -Dtests=false )
+	fi
 	meson_src_configure
 }
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 5b005bd9874c..6ffff813ee27 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -24,8 +24,8 @@ for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
 
-IUSE="${IUSE_VIDEO_CARDS} udev valgrind"
-RESTRICT="test" # see bug #236845
+IUSE="${IUSE_VIDEO_CARDS} test tools udev valgrind"
+RESTRICT="!test? ( test )"
 LICENSE="MIT"
 SLOT="0"
 
@@ -34,6 +34,10 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	valgrind? ( dev-util/valgrind )"
 RDEPEND="${COMMON_DEPEND}
+	video_cards_amdgpu? (
+		tools? ( >=dev-util/cunit-2.1 )
+		test?  ( >=dev-util/cunit-2.1 )
+	)
 	udev? ( virtual/udev )"
 BDEPEND="${PYTHON_DEPS}
 	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
@@ -59,7 +63,13 @@ multilib_src_configure() {
 		$(meson_feature video_cards_vmware vmwgfx)
 		# valgrind installs its .pc file to the pkgconfig for the primary arch
 		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dtests=false # Tests are restricted
+		$(meson_native_use_bool tools install-test-programs)
 	)
+
+	if use test || { multilib_is_native_abi && use tools; }; then
+		emesonargs+=( -Dtests=true  )
+	else
+		emesonargs+=( -Dtests=false )
+	fi
 	meson_src_configure
 }
diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml
index 144ba2de99b3..be660f032d0c 100644
--- a/x11-libs/libdrm/metadata.xml
+++ b/x11-libs/libdrm/metadata.xml
@@ -5,6 +5,9 @@
     <email>x11@gentoo.org</email>
     <name>X11</name>
   </maintainer>
+  <use>
+    <flag name="tools">Install optional tests and tools</flag>
+  </use>
   <upstream>
     <remote-id type="freedesktop-gitlab">mesa/drm</remote-id>
   </upstream>