[gentoo-commits] repo/gentoo:master commit in: x11-libs/libdrm/

["Matt Turner" <mattst88@gentoo.org>]

commit:     d7df87a0d50026c7340a26b500670a50529f2447
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 17:35:01 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 17:46:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7df87a0

x11-libs/libdrm: Version bump to 2.4.117

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-libs/libdrm/Manifest                                  |  1 +
 .../libdrm/{libdrm-9999.ebuild => libdrm-2.4.117.ebuild}  | 15 ++++++---------
 x11-libs/libdrm/libdrm-9999.ebuild                        |  4 +---
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 5fe01b7238d4..c60d6dd66343 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,2 +1,3 @@
 DIST libdrm-2.4.115.tar.xz 469952 BLAKE2B d4f794823476ca9c2e0383c0505cd787adad52b6873ba0fee913a861ebc7970a51524902aa0a2685ce2c5939fc6f9a71c5d1ad24d1f93407385b09255f701c06 SHA512 0c38d3cfd76f627b899f052527c2939d5fc87a417422dceb0761839ba21e69736703a87ba170b5ba7a4aca2506a240760c8c97ca1781a7fb78468225295293bd
 DIST libdrm-2.4.116.tar.xz 473560 BLAKE2B da393845a5af3aaf01592d1b56fcada587feed57fa48159d48c2b1f6aba36cc8cad22e0431a127cce92c15c006b97be59fe1895bb27f3d5b06c550ca40f45177 SHA512 1287d1896deeb8cfb4532c6750eb43493dcefbfaaa598a73bbb682aa749594eaad3ed1fa2fe73d06280350f365a92a0c20cad8be76f3da2ed59b04aa008de911
+DIST libdrm-2.4.117.tar.xz 475504 BLAKE2B cbda61815b1e5c3a5de285a9abe7f78669093d8b0f0f9f51cd38ea3b710e049de62d4f2591748f2000a1eb231d7b339a0ac7990934a9ccbfda62c6586c5b8236 SHA512 326cf565548fb9d50a321562c13acb2a2f5ad5915ffdc2b08ef812fbac887f5b3d271cb2ce8c483633edddf2c55064d55810ff6697f713c179e2d0c8048eb544

diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-2.4.117.ebuild
similarity index 90%
copy from x11-libs/libdrm/libdrm-9999.ebuild
copy to x11-libs/libdrm/libdrm-2.4.117.ebuild
index 592debf1d68d..d50f94dba9bd 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.117.ebuild
@@ -14,9 +14,7 @@ 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"
 fi
@@ -26,17 +24,15 @@ for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
 
-IUSE="${IUSE_VIDEO_CARDS} udev valgrind"
+IUSE="${IUSE_VIDEO_CARDS} valgrind"
 RESTRICT="test" # see bug #236845
 LICENSE="MIT"
 SLOT="0"
 
-COMMON_DEPEND="
+RDEPEND="
 	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
-RDEPEND="${COMMON_DEPEND}
-	udev? ( virtual/udev )"
 BDEPEND="${PYTHON_DEPS}
 	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
 
@@ -46,7 +42,8 @@ python_check_deps() {
 
 multilib_src_configure() {
 	local emesonargs=(
-		$(meson_use udev)
+		# Udev is only used by tests now.
+		-Dudev=false
 		-Dcairo-tests=disabled
 		$(meson_feature video_cards_amdgpu amdgpu)
 		$(meson_feature video_cards_exynos exynos)

diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 592debf1d68d..5b005bd9874c 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -14,9 +14,7 @@ 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"
 fi