gentoo resync : 15.12.2017

8 files changed, 0 insertions, 453 deletions

diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index d28fbedec732..02f98b8c05da 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,20 +1,6 @@
-DIST libdrm-2.4.75.tar.bz2 774589 BLAKE2B cb32eb5fbd5976e3ce8b1240d3dad3694f19628b0a6626a88a54d9ca0ab5f36155ace11b5d4ef6180cada41eff4f2922ed15a3376aa2c094e4286d7747cb0a63 SHA512 7d30029dfc384024eb6a82a04122064366572f5888ac4594fd9e02bc0a22ed2d154bef1840bd24f0543b77460d6359d7e424d424e10f4256ee3c898041be2292
-DIST libdrm-2.4.79.tar.bz2 783711 BLAKE2B 92b94f08bcd99fbb308dca4bdb6702b5b80df5aaa2567f729d6f10783d057440c0ba1b2ae9f12687d2955629888a78fd2771f3bff7eef8b2ab6e69bd1bca7f33 SHA512 62d6dbdf5e4e73e948fcb128a3ee76c88843d0aabf0af5751526829e9b95cff151a121af88ba9625acc7f5bc4ecfa71f9a3762005d5da76cff1d91dfc8ea8ea7
-DIST libdrm-2.4.80.tar.bz2 771243 BLAKE2B 99b15a356558133952a0a121e832d5baf21a053f07ff89c516d432689398d6829f4d119950d772718576910c5ff34e5ecd8c4a79fd54f39f5cc0fc6b5db0c63d SHA512 478f64bcc6f4815368ae86d023f11ba6b37595bb9d8baa588b466c6c0e2aae48a50a489137750ed21fbabef5afabf183c78c152eb770bfe316fa7401b191a30b
-DIST libdrm-2.4.81.tar.bz2 786276 BLAKE2B 8d07917cbc46ba21ea848c8c63fdc3718a9f765b418fb7d9f078a6b3e3384cddb9320ffdc67b1947a69bd1f272843a094df76340e55c4be4761a043e79126589 SHA512 5f7a1524acad59890d3f890bed90a660a424e18a88d587ca356223bde4a7446d1c540f97ec11cb10d2e7ed1b4ae86127957634354a1be6d04199295ab24782e5
 DIST libdrm-2.4.82.tar.bz2 754053 BLAKE2B 83d0a7203826c093bfb6b3ce4836f3ec6182a75f08f4cecb142e5707eb525cfbba9a123a94235b09370ac53cb7beb443604cb7dfba4cf375e0d0a74f71ce8bb4 SHA512 e69fd8c2b392daabbb3a548179e3a21a555d5174c11d76a288eb2a08850849aa867c7777b67798ec00e026e998a3b128c22698f05a7b44eb24cddc5c8a3a02d0
-DIST libdrm-2.4.84.tar.bz2 794348 BLAKE2B 0ef897506eaa9986292ecabba8351f6e81d37276656405f7d54517ea5783bf6a57d6105dcfac2da96aa116243d0b9c93f1ee7c51168a74b57f8f595e9a1aa699 SHA512 860ebc5fa934edee97e9e7e13aaa2f2e70a68b946f4f3893cd7f93b8296c10b3cd4ce4c23b1676eefe375286e6e2292b96e917d7976f65c61da3fa661e5e641a
-DIST libdrm-2.4.85.tar.bz2 795471 BLAKE2B a2bc8a65c0c5c6f789d5723c5c3e4b3a34c1a7c7ac07590990f9b3eaae891639434c45ceaba53d8b0a3d022d2bbdd9812c397aa851a12a9ea98b352658ed4a6e SHA512 c13b266ca2efd28506b9910306db4be378537dc13229b4d4d8f525e224d0f6a2a9ce326b9ae37dae1d716ae81c9c3bcc88d875104d567899e5854da3c63aa147
-DIST libdrm-2.4.87.tar.bz2 796368 BLAKE2B 5dae1afc9d3c8a9a2fbb8957887e0e4c3eee2a10add049313b5ad338a674eedc2e23702fe680fbd6bbc2a8c7651ef1f9dd6dbf59c036aad037215730e9eba919 SHA512 9ce259d38eaffbcaf82a6975ffa513307da6750bcc31a53cade5717f854151b0e7b6d4ce25c0b518cab5a542c544d5984329f216dc4cdc9369b4adae19a68e48
 DIST libdrm-2.4.88.tar.bz2 796583 BLAKE2B 4130633fea39e12514e6c6e7a926ca7ccca618ecb15a67cd27ee577a4ad56ecf6d09e20a323546a2b9698d7e41bd28377e7e04e8f478a3ca957868e1ac51cf98 SHA512 0d9d4bcc0d9be1fb6b1ca075339b22b0f927288a4c02bbcbf95406b5c095051890f3d2e0d32e529ef9b6952ce1250afd1e0765ad3188c2bac924dda8c33afabb
-EBUILD libdrm-2.4.75.ebuild 2025 BLAKE2B 8c6cc9c132bed3b238cd64d86a5dc842d5db3cc694a4922741b85e0a9b0db18dc664f162aa993738b1f792903ddd754c2d56929f05d2f8a9a0b5a283c2a8cae1 SHA512 8d7a0b34900c817d14da26817ce0df5e3edd961c21b3d8935463bc55110ada6947db1db1205a99d511c3c6abeb3945a38cb40b30e00744aebee342f6b6e85fb8
-EBUILD libdrm-2.4.79.ebuild 2034 BLAKE2B 025ec6bbd64910fb74d116dcd1e646fbcb0bef1c316928ebe48be3f5e922abbb1e306da895db8ac4e0c1ba1b57a083c3e4004f3cbacf7052b67abb13ff23d7a8 SHA512 9d8d83f85a204ed6859affbaa80413f399eeeb5b9981de542cd301e8201136325d1237d0ef74682381f7441e9dace713bef5fc6eb00addf27b37bfbbd3cac70c
-EBUILD libdrm-2.4.80.ebuild 2039 BLAKE2B 73dc5b990db3f99863de5ca880cffb87a3faeb29cb182949884345f08ccb76b21b4afba4c1cbe032a435143c4ffd3df89ce05a291294ccfeb47dfecb45c62de1 SHA512 2676f7d59c5020432269cfe7450b8b544e73478e9667c0fb7627fc5d09d662675e31218a70d8190a0426381688a7e8d30afe2d3b957a2cd04395540e097913bb
-EBUILD libdrm-2.4.81.ebuild 2047 BLAKE2B 8a85b781c074d3ab093d2439310486887dd110d08c8ef8ef2b17772d6c5b2c0b7aaa16b6615fed9882104c94af08e5505374a4e35e394c35fde0cc11023492ff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f
 EBUILD libdrm-2.4.82.ebuild 2038 BLAKE2B 684c6a522fe07fb77bbbaa6f06a45db8055898368e420c6ad555afc795957a789b03a5c2a3a4480d00314b4c9e3a1bb239242c0e2031a4534814ea0f7a6149b8 SHA512 ddb3b11965a574dc79e135df8d6f6b7cd93460fb45f86e7855fb4be704dbf40b18ec15a8cba6154e4c72bd3a1f0bcf0d895cc40906ee95748916846d7bb04d37
-EBUILD libdrm-2.4.84.ebuild 2047 BLAKE2B 8a85b781c074d3ab093d2439310486887dd110d08c8ef8ef2b17772d6c5b2c0b7aaa16b6615fed9882104c94af08e5505374a4e35e394c35fde0cc11023492ff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f
-EBUILD libdrm-2.4.85.ebuild 2047 BLAKE2B 8a85b781c074d3ab093d2439310486887dd110d08c8ef8ef2b17772d6c5b2c0b7aaa16b6615fed9882104c94af08e5505374a4e35e394c35fde0cc11023492ff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f
-EBUILD libdrm-2.4.87.ebuild 2047 BLAKE2B 8a85b781c074d3ab093d2439310486887dd110d08c8ef8ef2b17772d6c5b2c0b7aaa16b6615fed9882104c94af08e5505374a4e35e394c35fde0cc11023492ff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f
 EBUILD libdrm-2.4.88.ebuild 2047 BLAKE2B 8a85b781c074d3ab093d2439310486887dd110d08c8ef8ef2b17772d6c5b2c0b7aaa16b6615fed9882104c94af08e5505374a4e35e394c35fde0cc11023492ff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f
 EBUILD libdrm-9999.ebuild 1913 BLAKE2B e345ca85c9a743193bac55d2a29d128d68bd7a022f30f8bf1d804a6ceed0b380b41584d96c64642f4d577fd62b027c2fde11a24959fd6e3afd9b8b04173a45e2 SHA512 838f1ee18aba8bf9a31fe3b81300366c63fb7d34d386d5cdcea9aae23241c01d40863f80ecc84844867b72ceb30a9290558311c2302a88a3fdbd933bb5bad531
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.75.ebuild b/x11-libs/libdrm/libdrm-2.4.75.ebuild
deleted file mode 100644
index ea93d9f498e9..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.75.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-fi
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-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
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		# tests are restricted, no point in building them
-		sed -ie 's/tests //' "${S}"/Makefile.am
-	fi
-	xorg-2_src_prepare
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		# Udev is only used by tests now.
-		--disable-udev
-		--disable-cairo-tests
-		$(use_enable video_cards_amdgpu amdgpu)
-		$(use_enable video_cards_exynos exynos-experimental-api)
-		$(use_enable video_cards_freedreno freedreno)
-		$(use_enable video_cards_intel intel)
-		$(use_enable video_cards_nouveau nouveau)
-		$(use_enable video_cards_omap omap-experimental-api)
-		$(use_enable video_cards_radeon radeon)
-		$(use_enable video_cards_tegra tegra-experimental-api)
-		$(use_enable video_cards_vc4 vc4)
-		$(use_enable video_cards_vivante etnaviv-experimental-api)
-		$(use_enable video_cards_vmware vmwgfx)
-		$(use_enable libkms)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		--enable-valgrind=$(usex valgrind auto no)
-	)
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.79.ebuild b/x11-libs/libdrm/libdrm-2.4.79.ebuild
deleted file mode 100644
index 4a663bdd0b10..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.79.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-fi
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-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
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		# tests are restricted, no point in building them
-		sed -ie 's/tests //' "${S}"/Makefile.am
-	fi
-	xorg-2_src_prepare
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		# Udev is only used by tests now.
-		--disable-udev
-		--disable-cairo-tests
-		$(use_enable video_cards_amdgpu amdgpu)
-		$(use_enable video_cards_exynos exynos-experimental-api)
-		$(use_enable video_cards_freedreno freedreno)
-		$(use_enable video_cards_intel intel)
-		$(use_enable video_cards_nouveau nouveau)
-		$(use_enable video_cards_omap omap-experimental-api)
-		$(use_enable video_cards_radeon radeon)
-		$(use_enable video_cards_tegra tegra-experimental-api)
-		$(use_enable video_cards_vc4 vc4)
-		$(use_enable video_cards_vivante etnaviv-experimental-api)
-		$(use_enable video_cards_vmware vmwgfx)
-		$(use_enable libkms)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		--enable-valgrind=$(usex valgrind auto no)
-	)
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.80.ebuild b/x11-libs/libdrm/libdrm-2.4.80.ebuild
deleted file mode 100644
index 14a8265d38fc..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.80.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-fi
-
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-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
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		# tests are restricted, no point in building them
-		sed -ie 's/tests //' "${S}"/Makefile.am
-	fi
-	xorg-2_src_prepare
-	epatch_user
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		# Udev is only used by tests now.
-		--disable-udev
-		--disable-cairo-tests
-		$(use_enable video_cards_amdgpu amdgpu)
-		$(use_enable video_cards_exynos exynos-experimental-api)
-		$(use_enable video_cards_freedreno freedreno)
-		$(use_enable video_cards_intel intel)
-		$(use_enable video_cards_nouveau nouveau)
-		$(use_enable video_cards_omap omap-experimental-api)
-		$(use_enable video_cards_radeon radeon)
-		$(use_enable video_cards_tegra tegra-experimental-api)
-		$(use_enable video_cards_vc4 vc4)
-		$(use_enable video_cards_vivante etnaviv-experimental-api)
-		$(use_enable video_cards_vmware vmwgfx)
-		$(use_enable libkms)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		--enable-valgrind=$(usex valgrind auto no)
-	)
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.81.ebuild b/x11-libs/libdrm/libdrm-2.4.81.ebuild
deleted file mode 100644
index b8477e723d2a..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.81.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-fi
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-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
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		# tests are restricted, no point in building them
-		sed -ie 's/tests //' "${S}"/Makefile.am
-	fi
-	xorg-2_src_prepare
-	epatch_user
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		# Udev is only used by tests now.
-		--disable-udev
-		--disable-cairo-tests
-		$(use_enable video_cards_amdgpu amdgpu)
-		$(use_enable video_cards_exynos exynos-experimental-api)
-		$(use_enable video_cards_freedreno freedreno)
-		$(use_enable video_cards_intel intel)
-		$(use_enable video_cards_nouveau nouveau)
-		$(use_enable video_cards_omap omap-experimental-api)
-		$(use_enable video_cards_radeon radeon)
-		$(use_enable video_cards_tegra tegra-experimental-api)
-		$(use_enable video_cards_vc4 vc4)
-		$(use_enable video_cards_vivante etnaviv-experimental-api)
-		$(use_enable video_cards_vmware vmwgfx)
-		$(use_enable libkms)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		--enable-valgrind=$(usex valgrind auto no)
-	)
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.84.ebuild b/x11-libs/libdrm/libdrm-2.4.84.ebuild
deleted file mode 100644
index b8477e723d2a..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.84.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-fi
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-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
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		# tests are restricted, no point in building them
-		sed -ie 's/tests //' "${S}"/Makefile.am
-	fi
-	xorg-2_src_prepare
-	epatch_user
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		# Udev is only used by tests now.
-		--disable-udev
-		--disable-cairo-tests
-		$(use_enable video_cards_amdgpu amdgpu)
-		$(use_enable video_cards_exynos exynos-experimental-api)
-		$(use_enable video_cards_freedreno freedreno)
-		$(use_enable video_cards_intel intel)
-		$(use_enable video_cards_nouveau nouveau)
-		$(use_enable video_cards_omap omap-experimental-api)
-		$(use_enable video_cards_radeon radeon)
-		$(use_enable video_cards_tegra tegra-experimental-api)
-		$(use_enable video_cards_vc4 vc4)
-		$(use_enable video_cards_vivante etnaviv-experimental-api)
-		$(use_enable video_cards_vmware vmwgfx)
-		$(use_enable libkms)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		--enable-valgrind=$(usex valgrind auto no)
-	)
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.85.ebuild b/x11-libs/libdrm/libdrm-2.4.85.ebuild
deleted file mode 100644
index b8477e723d2a..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.85.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-fi
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-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
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		# tests are restricted, no point in building them
-		sed -ie 's/tests //' "${S}"/Makefile.am
-	fi
-	xorg-2_src_prepare
-	epatch_user
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		# Udev is only used by tests now.
-		--disable-udev
-		--disable-cairo-tests
-		$(use_enable video_cards_amdgpu amdgpu)
-		$(use_enable video_cards_exynos exynos-experimental-api)
-		$(use_enable video_cards_freedreno freedreno)
-		$(use_enable video_cards_intel intel)
-		$(use_enable video_cards_nouveau nouveau)
-		$(use_enable video_cards_omap omap-experimental-api)
-		$(use_enable video_cards_radeon radeon)
-		$(use_enable video_cards_tegra tegra-experimental-api)
-		$(use_enable video_cards_vc4 vc4)
-		$(use_enable video_cards_vivante etnaviv-experimental-api)
-		$(use_enable video_cards_vmware vmwgfx)
-		$(use_enable libkms)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		--enable-valgrind=$(usex valgrind auto no)
-	)
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.87.ebuild b/x11-libs/libdrm/libdrm-2.4.87.ebuild
deleted file mode 100644
index b8477e723d2a..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.87.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-fi
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-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
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		# tests are restricted, no point in building them
-		sed -ie 's/tests //' "${S}"/Makefile.am
-	fi
-	xorg-2_src_prepare
-	epatch_user
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		# Udev is only used by tests now.
-		--disable-udev
-		--disable-cairo-tests
-		$(use_enable video_cards_amdgpu amdgpu)
-		$(use_enable video_cards_exynos exynos-experimental-api)
-		$(use_enable video_cards_freedreno freedreno)
-		$(use_enable video_cards_intel intel)
-		$(use_enable video_cards_nouveau nouveau)
-		$(use_enable video_cards_omap omap-experimental-api)
-		$(use_enable video_cards_radeon radeon)
-		$(use_enable video_cards_tegra tegra-experimental-api)
-		$(use_enable video_cards_vc4 vc4)
-		$(use_enable video_cards_vivante etnaviv-experimental-api)
-		$(use_enable video_cards_vmware vmwgfx)
-		$(use_enable libkms)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		--enable-valgrind=$(usex valgrind auto no)
-	)
-
-	xorg-2_src_configure
-}