gentoo resync : 20.03.2022

4 files changed, 4 insertions, 133 deletions

diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 3f0d2fa6ad52..aa556d1bf0b6 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,10 +1,6 @@
-DIST libdrm-2.4.106.tar.xz 418176 BLAKE2B b0f935297239560179ec8994b62c7161494d4c1aa33bbfdc4d5e4ecff97d252f7556575391ebf486e24257c365415e656b9f84ac883dc9d56baf39e79ff8c5f2 SHA512 33140e579906ab54b716149056af500c628ce41cd9ae3b0c33496693d2f5903fbcfccee8a942dd1560e1591111ed240da42612d5af5e75558db6f6a85d14617d
-DIST libdrm-2.4.107.tar.xz 425612 BLAKE2B a685cd9a6549c7bdf1efb4e7ebddd0ea49554fa718f8328c868a1f245e7c072933e49546591c056ba7ece8d8841b8138e4247dd8697238a18c2cd92fe5446341 SHA512 c7542ba15c4c934519a6a1f3cb1ec21effa820a805a030d0175313bb1cc796cd311f39596ead883f9f251679d701e262894c5a297d5cf45093c80a6cd818def0
-DIST libdrm-2.4.108.tar.xz 432492 BLAKE2B 943107e4ece51336c2cec690b2805cac3ebe4502c548401ba7add1b1cdcb6c9959e4a9fe75890438e0b30646f8dde1b322585544aa33abb5257a23cc3eeed3ab SHA512 6a841dc3eb8eae7d75e1d35d23a14d51aff758e5a251dbcf6fc8c28d973d935a4a2f6751b405e956b2777d93c651721199ac80c3cd14b87d021668120d6bc974
 DIST libdrm-2.4.109.tar.xz 433708 BLAKE2B 99c612a4f9a8e9068debbecfc428f4af530705fca47df9c8e6f0fe6ed740610ded1db0d0e37a063ae893e1697c2f8c4dcc8e15b8909d8ba7c66cd941d7400d24 SHA512 45194bb28207421afcff3e247930d2eeab77a5fea58e6be22f67525f2e0aab2f410a9ae0ab315b55ef56b80c481bba40b1660468b7cda539758b2bbb8e814fd8
-EBUILD libdrm-2.4.106.ebuild 1742 BLAKE2B 85694c5857f949f178042878f79b04cb0c190d5f452c88cb7d7454e705510d0a0f3d871ecf45bb52ddb17b8c77585c3c56bcae2fbe27a13655b92338f20787f1 SHA512 45d320a9af316e549c9e38260cc994c6f8812834a8c426a5ad9cb4735159d9dc6c4eeb944b571575ae62ce6359d3d02e00fafc0991002ad7ad99a9d84e9160c9
-EBUILD libdrm-2.4.107.ebuild 1958 BLAKE2B 5a9c0b7f38715a5d9ca657df44b6509569749519d0a8d297c0991af32d1aaec36f74785d80cfaafedfa285c6ed825986015115c7c7956611c3beb6a939f7513e SHA512 3c24a14847a59dc0d13d87d016aa623f2743d3297622301d6a8df583a10972a787fe8b76a415dadd99e84e4e4936783472f9dfd92171deeb2891f1f563417528
-EBUILD libdrm-2.4.108.ebuild 1966 BLAKE2B 54d431322199e68cb172a9bfdddfb5901cc9cd482d7d6126efe6157a9ebaa5abe189180fcc23e12692dc93edf4e6a4e14ffc55d0969df0d392f9095019dc9c58 SHA512 ea18789d0813cb14a91ba3a5bc1fb8005ef530dbe34b77d9b643790e43dfe6cee26f29a2c9ea566a1b59273d834b72a67711bd27fa91e312abefeb5c5a23e159
+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 1972 BLAKE2B d1c94cb310f25d91e2ce7907488a19175780a3b326abf5a2a7662cd057af379eb3645a8c649dd06b6a82bec1ee510b755b99ee3c186bafd026fe226814790509 SHA512 38ea25a0bf6cd75f77b85e7b7ee433390e4412bb32fb9765d8dc60b618a155df4590e3f67fab21f2352a290d6620730f4e66b36dc471ea3196aba994cfa19cfd
 EBUILD libdrm-9999.ebuild 1966 BLAKE2B 54d431322199e68cb172a9bfdddfb5901cc9cd482d7d6126efe6157a9ebaa5abe189180fcc23e12692dc93edf4e6a4e14ffc55d0969df0d392f9095019dc9c58 SHA512 ea18789d0813cb14a91ba3a5bc1fb8005ef530dbe34b77d9b643790e43dfe6cee26f29a2c9ea566a1b59273d834b72a67711bd27fa91e312abefeb5c5a23e159
 MISC metadata.xml 407 BLAKE2B 1ec724640ea057ea29a6c84f3dcd34cb6a3f4bd7731c00d486688c9ec1dce393133e58b86ade00e51f91c80fe521e8829cfb796bd7cdc2e3d8c7be450d4c4188 SHA512 b54da0a8739fda9bb388e9893d992323247df89d9e97d20f29c62e64b189bf38092615cf113ae5048ce223270ebfaa128bb6b5fa119e5e8c8cdf2bda76a64769
diff --git a/x11-libs/libdrm/libdrm-2.4.106.ebuild b/x11-libs/libdrm/libdrm-2.4.106.ebuild
deleted file mode 100644
index 218b87fe7031..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.106.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 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"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} 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 ~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 )"
-
-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.108.ebuild b/x11-libs/libdrm/libdrm-2.4.108.ebuild
deleted file mode 100644
index c34f20fb240d..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.108.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 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 ~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.107.ebuild b/x11-libs/libdrm/libdrm-2.4.110.ebuild
index a4ec5f0969d2..15d2707a6f52 100644
--- a/x11-libs/libdrm/libdrm-2.4.107.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"