gentoo resync : 25.08.2020

3 files changed, 2 insertions, 80 deletions

diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index abe5f20a6650..9b49b33868c9 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,4 @@
-DIST libdrm-2.4.100.tar.bz2 855793 BLAKE2B ba2c631de860b8e2a8bb34d8ac0ba2ed11c05cc98a156bb81ffafa0395e22f79878b9936efd1ae33c31049c2a5cc281586a867a974eeb4018dd713a8481ed269 SHA512 4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247
 DIST libdrm-2.4.102.tar.xz 408844 BLAKE2B f3a5ddb96130d175e860984412949713cd30145a3a9e453f666b650ec9b7eedb1c8e230aa7c5769331a330d833fdeba3da28b339150d81c17716a96935267178 SHA512 386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c
-EBUILD libdrm-2.4.100.ebuild 2120 BLAKE2B 97b0766f1a0b6bd1b796d4049891323c7442bc2d05f3f58bfab236d335b21c76c0cf4312702e3b0d57f6de3fae681bc3eeec97ae17e80a0b6783a11c23921e1d SHA512 e136099e103664353af667600f77f2bdeb8594395cc15f27a5e06b85f18ca28962ac81e955b886e0db157e5e8caf1b59c6ffe952d2286e5d3c9131d5ea9d71a3
-EBUILD libdrm-2.4.102.ebuild 1988 BLAKE2B d8456210498cfd377691e05d37ef8abb1412de0f3fc871f7ffc4cc141a34a95b196ec843ce0939719e3d9fee6d6dffd46de6fdae4b6d1426235d591ff9268022 SHA512 9ed3335d53489a17d895493c948c7ae44ec645c07ea6b8d1271deb62203a02c8b38120d0a717c15de3e8061098a7ad57f5b6f2ee96ebebd06bdf37758975e801
+EBUILD libdrm-2.4.102.ebuild 1980 BLAKE2B 521ae5ff9a2b781e3fc22f089e4276a0f739bfae842e4379e3f332bdff0f6d0ff0a2bfe52d6346f3f4c6a81586878c2acd574441ca1cc43bab5db46353bde3ce SHA512 37b69924e37465600c6f48455646c3ca8fae6d0563581a0316e534a0671280c989b37fd9bd1b3d64c80f7655d21d68ed5a9b93f684dbdadca1d11deecb16ab64
 EBUILD libdrm-9999.ebuild 1988 BLAKE2B d8456210498cfd377691e05d37ef8abb1412de0f3fc871f7ffc4cc141a34a95b196ec843ce0939719e3d9fee6d6dffd46de6fdae4b6d1426235d591ff9268022 SHA512 9ed3335d53489a17d895493c948c7ae44ec645c07ea6b8d1271deb62203a02c8b38120d0a717c15de3e8061098a7ad57f5b6f2ee96ebebd06bdf37758975e801
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.100.ebuild b/x11-libs/libdrm/libdrm-2.4.100.ebuild
deleted file mode 100644
index 83a5eaf7240b..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.100.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~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="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-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.102.ebuild b/x11-libs/libdrm/libdrm-2.4.102.ebuild
index 46ea35c8a426..d20191fc0514 100644
--- a/x11-libs/libdrm/libdrm-2.4.102.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.102.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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"