gentoo resync : 28.07.2021

3 files changed, 2 insertions, 75 deletions

diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index e609513a8eec..78f48c5da183 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,8 +1,6 @@
-DIST libdrm-2.4.105.tar.xz 420376 BLAKE2B 1443dd378263358e7af64ee63ac6d25d2c5efaacaf2f76be1a0021f03dd08ce4580ef8531af076504c5a29e538d5c66d1773fb0439dd8bc312f3a038535dd07d SHA512 083a04af7208e58be21b89c6ebdbe2db3ba00cd29f0d271bd38bfe97dfca741edafddaaf9b5b95c20fac2c9b700434ea5b21397de26f7073169ad6f5b090f715
 DIST libdrm-2.4.106.tar.xz 418176 BLAKE2B b0f935297239560179ec8994b62c7161494d4c1aa33bbfdc4d5e4ecff97d252f7556575391ebf486e24257c365415e656b9f84ac883dc9d56baf39e79ff8c5f2 SHA512 33140e579906ab54b716149056af500c628ce41cd9ae3b0c33496693d2f5903fbcfccee8a942dd1560e1591111ed240da42612d5af5e75558db6f6a85d14617d
 DIST libdrm-2.4.107.tar.xz 425612 BLAKE2B a685cd9a6549c7bdf1efb4e7ebddd0ea49554fa718f8328c868a1f245e7c072933e49546591c056ba7ece8d8841b8138e4247dd8697238a18c2cd92fe5446341 SHA512 c7542ba15c4c934519a6a1f3cb1ec21effa820a805a030d0175313bb1cc796cd311f39596ead883f9f251679d701e262894c5a297d5cf45093c80a6cd818def0
-EBUILD libdrm-2.4.105.ebuild 1988 BLAKE2B cfb94eaf9f6bc949b597d915556b52f9de85d0c10aa20aca571a27f99500f9543dc368771ee61c59b89e18f5d9ecbd72eb17f716b9a7ecea35a6d7b4f9b18efd SHA512 32c0df2d09c9088ff2fd2dcfff73ebd78355c8132e2f042413300b31e63b4ffb878f57cc513733da190b6e19b241b5c2a0cba5b7aaf7d5f46d3f5358664ffa8f
-EBUILD libdrm-2.4.106.ebuild 1743 BLAKE2B 9b2740e590c37ef476ec224797c525c7e926e78dd1ad2ae12d389609dbb91cc58d04984ff1d0f6598ecce2cf38a2c66191fa49b99d9ec35644673331bd00891b SHA512 d952cc35347917f7be1aa256e1a997c69d72977b7fba566b70f48d6106bdeb9c85edcb631c9064806a6c1b10e840731637d8e51cd4abfcf7b62398f044afa88e
+EBUILD libdrm-2.4.106.ebuild 1742 BLAKE2B 85694c5857f949f178042878f79b04cb0c190d5f452c88cb7d7454e705510d0a0f3d871ecf45bb52ddb17b8c77585c3c56bcae2fbe27a13655b92338f20787f1 SHA512 45d320a9af316e549c9e38260cc994c6f8812834a8c426a5ad9cb4735159d9dc6c4eeb944b571575ae62ce6359d3d02e00fafc0991002ad7ad99a9d84e9160c9
 EBUILD libdrm-2.4.107.ebuild 1749 BLAKE2B 7d42273c2a45a5901adaa86e09b506a1ef299132cbf03e18516ae226c262841015dad8b5fc9ab1e4aa4168303471047f59e34865b7220c8bf4b142010f0787a1 SHA512 d2494d35d6bd00c046c8998f2530e172cc3b565b1b2ace0438fdc65b5fca074bb407167e86a546c63e4a1d70cc06499fb23354648b056e54a508ae3ca8cb1dd5
 EBUILD libdrm-9999.ebuild 1749 BLAKE2B 7d42273c2a45a5901adaa86e09b506a1ef299132cbf03e18516ae226c262841015dad8b5fc9ab1e4aa4168303471047f59e34865b7220c8bf4b142010f0787a1 SHA512 d2494d35d6bd00c046c8998f2530e172cc3b565b1b2ace0438fdc65b5fca074bb407167e86a546c63e4a1d70cc06499fb23354648b056e54a508ae3ca8cb1dd5
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.105.ebuild b/x11-libs/libdrm/libdrm-2.4.105.ebuild
deleted file mode 100644
index d5cf97cabb30..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.105.ebuild
+++ /dev/null
@@ -1,71 +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-minimal
-
-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
-		-Damdgpu=$(usex video_cards_amdgpu true false)
-		-Dexynos=$(usex video_cards_exynos true false)
-		-Dfreedreno=$(usex video_cards_freedreno true false)
-		-Dintel=$(usex video_cards_intel true false)
-		-Dnouveau=$(usex video_cards_nouveau true false)
-		-Domap=$(usex video_cards_omap true false)
-		-Dradeon=$(usex video_cards_radeon true false)
-		-Dtegra=$(usex video_cards_tegra true false)
-		-Dvc4=$(usex video_cards_vc4 true false)
-		-Detnaviv=$(usex video_cards_vivante true false)
-		-Dvmwgfx=$(usex video_cards_vmware true false)
-		-Dlibkms=$(usex libkms true false)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.106.ebuild b/x11-libs/libdrm/libdrm-2.4.106.ebuild
index 4ca4e6353d7b..218b87fe7031 100644
--- a/x11-libs/libdrm/libdrm-2.4.106.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.106.ebuild
@@ -17,7 +17,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 ~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"