gentoo resync : 29.12.2022

5 files changed, 9 insertions, 79 deletions

diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 1675d65ef011..64f8531defe3 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,4 @@
-DIST libdrm-2.4.109.tar.xz 433708 BLAKE2B 99c612a4f9a8e9068debbecfc428f4af530705fca47df9c8e6f0fe6ed740610ded1db0d0e37a063ae893e1697c2f8c4dcc8e15b8909d8ba7c66cd941d7400d24 SHA512 45194bb28207421afcff3e247930d2eeab77a5fea58e6be22f67525f2e0aab2f410a9ae0ab315b55ef56b80c481bba40b1660468b7cda539758b2bbb8e814fd8
-DIST libdrm-2.4.110.tar.xz 436372 BLAKE2B 0d5f8bfe47bdcc96ef7dbe3ecf2da0b21262bae4396fa1e73c0f728d970d041a9925082c4526bc71e00f110c2eb0ba94313d9a7c27a2d4676073fdbc3708c628 SHA512 52f92ef1fe4c218a1d7dba53ef43334dbfca80e3209afe59f3a32c4bf67473126534e990df07a931a12d46a3b997c21ef17c1c4d8a0c88d44d5c6c040e3b6be3
-EBUILD libdrm-2.4.109.ebuild 1964 BLAKE2B 773409a81dd537f1fdb79422c25639f1a9e3ac222a413099a6de3cadd0b3cbe44141b3563d9dfbfc37e5fe034bc71b4aabcb4f4d990bac7d86e11cdaeb9d93f8 SHA512 be75aab37f19d08cb71cc8efacb0def1a086db3b88a4b53e6658da064c4c1d879b5eda0ba1fbdf7f74a1718b65206b17e00aaeb9906b9662c3f8317bdaa48317
-EBUILD libdrm-2.4.110.ebuild 1975 BLAKE2B 5fd777fbb8f020ba563810ebde19d07d298bb0e5ae0d603dc2388cce9347b28439022277b07c953e15451cbcaa3b2cc2f3ee133344a069f51e68b3fe5ce7b0bd SHA512 ff2285fcc2b4c1d993828b104ef3b131574e04742eb48c08e77520e169d491c23c25d4b1c662ead78d9e3d81e2c3a8c85da4ce8395a32ebd311b796393730214
-EBUILD libdrm-9999.ebuild 1944 BLAKE2B 76ef85b65180a0f3f799a91a54d6ee1484bf71c3df87d14f10b8a45402b58d5e76f0b676905843a90e7e965ac81c3ab8dd35845aa960427492527a1b5038d8b7 SHA512 810efaf6477edacf82e1ca195db85908f17ab71807dbe43b7da84d9b15aca6e0740572b3702c2eadff7ced2c90009964c9290c68a21b6d0c2a9805337764594e
-MISC metadata.xml 407 BLAKE2B 1ec724640ea057ea29a6c84f3dcd34cb6a3f4bd7731c00d486688c9ec1dce393133e58b86ade00e51f91c80fe521e8829cfb796bd7cdc2e3d8c7be450d4c4188 SHA512 b54da0a8739fda9bb388e9893d992323247df89d9e97d20f29c62e64b189bf38092615cf113ae5048ce223270ebfaa128bb6b5fa119e5e8c8cdf2bda76a64769
+DIST libdrm-2.4.111.tar.xz 447388 BLAKE2B bd1fe6a1af3dbdd542ea9d3b887121d917c11ef9c3c0074bbe5d18ffd15050e2df63c744aa5e559e7f8a1f1e9561d3b2ba8b9a45ad72d7c1e6393b7eae99cf54 SHA512 17e92e9e4ded8031ac222764bed7e9ff430a1a377f5e435f6b62b4a7f45cb4c4b769b3b79fbcba11512c1ac973abf8cdcca8e0b9659ae095e915d3d5efcf5516
+EBUILD libdrm-2.4.111.ebuild 1942 BLAKE2B ce7a3fcd053b207c2c78f20667bf9264d7b5c0f75039fcc49f2b771660eb913307462c35b094ff2b309eaf4e0a658ce68fadce94cb091bb8e07ada1342c769bb SHA512 5f7a642ce1571333d431558af4824ce604463e41f5e031e54c24063f8dc0ed8083875bbdab6fd429e32cf3864726c89505b587546c64d3589c4d0de89456f486
+EBUILD libdrm-9999.ebuild 1950 BLAKE2B d892aa28a9055968915a2eb329ca9ac49bbcaec0ae4f417f46d7fcf0641c2ee95086d8b09d3b433b0d07e452db95951f8c80e0ec8466fbdbbe03a60459a0652d SHA512 a2f387299e8d2446a63efb5f7c80061414143dfe8dde9216c7d6f3d9a6f50e1820f97f27fa7d5977d84b0f83e5119e06c0eddd2e290b773f730744160538fa2b
+MISC metadata.xml 304 BLAKE2B e47f11b45b5c90804d5dfd27dbe2f2156099661ac7546152fb4e62046fd030838a0944d7dea35efd2f7b527eb88992c5049a40282dea58097b991c6bcd843693 SHA512 b798cffebaf330272494b6ef84c9c587a920e27ac0ae26336ff256de21768274cfcbe8feb61b7f63bff52294e460f945ada9ab9ddaeaea91d17bc1d6d41360da
diff --git a/x11-libs/libdrm/libdrm-2.4.110.ebuild b/x11-libs/libdrm/libdrm-2.4.110.ebuild
deleted file mode 100644
index 8f412ec60d52..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.110.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{8..10} )
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-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
-	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
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
-
-python_check_deps() {
-	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		$(meson_use video_cards_amdgpu amdgpu)
-		$(meson_use video_cards_exynos exynos)
-		$(meson_use video_cards_freedreno freedreno)
-		$(meson_use video_cards_intel intel)
-		$(meson_use video_cards_nouveau nouveau)
-		$(meson_use video_cards_omap omap)
-		$(meson_use video_cards_radeon radeon)
-		$(meson_use video_cards_tegra tegra)
-		$(meson_use video_cards_vc4 vc4)
-		$(meson_use video_cards_vivante etnaviv)
-		$(meson_use video_cards_vmware vmwgfx)
-		$(meson_use libkms)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.109.ebuild b/x11-libs/libdrm/libdrm-2.4.111.ebuild
index d8d497e8f3f8..25b15697e55f 100644
--- a/x11-libs/libdrm/libdrm-2.4.109.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.111.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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,7 +26,7 @@ for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
 
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+IUSE="${IUSE_VIDEO_CARDS} valgrind"
 RESTRICT="test" # see bug #236845
 LICENSE="MIT"
 SLOT="0"
@@ -58,7 +58,6 @@ multilib_src_configure() {
 		$(meson_use video_cards_vc4 vc4)
 		$(meson_use video_cards_vivante etnaviv)
 		$(meson_use video_cards_vmware vmwgfx)
-		$(meson_use libkms)
 		# valgrind installs its .pc file to the pkgconfig for the primary arch
 		-Dvalgrind=$(usex valgrind auto false)
 	)
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 2c0a31f176d6..a8ccddd22d1b 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml
index cfcecf022b00..73e3db5cabfe 100644
--- a/x11-libs/libdrm/metadata.xml
+++ b/x11-libs/libdrm/metadata.xml
@@ -6,7 +6,6 @@
 <name>X11</name>
 </maintainer>
 <use>
-<flag name="libkms">Enable building of libkms, a library for applications to interface with KMS</flag>
 <flag name="valgrind">Compile in valgrind memory hints</flag>
 </use>
 </pkgmetadata>