remove old

Signed-off-by: aballier@gentoo.org
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

12 files changed, 8 insertions, 1158 deletions

diff --git a/x11-libs/libva/ChangeLog b/x11-libs/libva/ChangeLog
index 01552b5a02f9..c2bd1bacef1f 100644
--- a/x11-libs/libva/ChangeLog
+++ b/x11-libs/libva/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libva
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.60 2014/07/15 15:47:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.61 2014/10/24 06:54:46 aballier Exp $
+
+  24 Oct 2014; Alexis Ballier <aballier@gentoo.org> -libva-1.0.15.ebuild,
+  -libva-1.0.16.ebuild, -libva-1.1.0.ebuild, -libva-1.1.1.ebuild,
+  -libva-1.1.1-r1.ebuild, -libva-1.2.0.ebuild, -libva-1.2.0-r1.ebuild,
+  -libva-1.2.1.ebuild, -libva-1.2.1-r1.ebuild, -libva-1.3.0.ebuild,
+  -files/libva-1.1.0-wayland1.patch:
+  remove old
 
   15 Jul 2014; Pacho Ramos <pacho@gentoo.org> libva-1.3.1.ebuild:
   amd64/x86 stable, bug #516318
diff --git a/x11-libs/libva/files/libva-1.1.0-wayland1.patch b/x11-libs/libva/files/libva-1.1.0-wayland1.patch
deleted file mode 100644
index 653bcb9caef0..000000000000
--- a/x11-libs/libva/files/libva-1.1.0-wayland1.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-commit b1cf861a087234eb797c402040403a538adbe0cc
-Author: Rob Bradford <rob@linux.intel.com>
-Date:   Fri Nov 2 10:57:47 2012 +0000
-
-    wayland: port to 1.0 protocol.
-    
-    With the change in protocol the hash of globals maintained by the client was
-    dropped. Instead we must setup a listener on the registry and get the globals
-    in a stream from that.
-    
-    Signed-off-by: Rob Bradford <rob@linux.intel.com>
-    Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-
-diff --git a/configure.ac b/configure.ac
-index de83e35..257964d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -78,7 +78,7 @@ m4_define([libva_lt_age],
- m4_define([libdrm_version], [2.4])
- 
- # Wayland minimum version number
--m4_define([wayland_api_version], [0.95.0])
-+m4_define([wayland_api_version], [1.0.0])
- 
- AC_PREREQ(2.57)
- AC_INIT([libva], [libva_version], [waldo.bastian@intel.com], libva)
-diff --git a/test/common/va_display_wayland.c b/test/common/va_display_wayland.c
-index 332d16d..abcb2b6 100644
---- a/test/common/va_display_wayland.c
-+++ b/test/common/va_display_wayland.c
-@@ -33,42 +33,39 @@
- 
- struct display {
-     struct wl_display          *display;
-+    struct wl_registry         *registry;
-     struct wl_compositor       *compositor;
-     struct wl_shell            *shell;
-     struct wl_shell_surface    *shell_surface;
-     struct wl_surface          *surface;
-     unsigned int                ref_count;
-     int                         event_fd;
--    unsigned int                event_mask;
- };
- 
- static struct display *g_display;
- 
- static void
--display_handle_global(
--    struct wl_display *display,
--    uint32_t           id,
--    const char        *interface,
--    uint32_t           version,
--    void              *data
-+registry_handle_global(
-+    void               *data,
-+    struct wl_registry *registry,
-+    uint32_t            id,
-+    const char         *interface,
-+    uint32_t            version
- )
- {
-     struct display * const d = data;
- 
-     if (strcmp(interface, "wl_compositor") == 0)
--        d->compositor = wl_display_bind(display, id, &wl_compositor_interface);
-+        d->compositor =
-+            wl_registry_bind(registry, id, &wl_compositor_interface, 1);
-     else if (strcmp(interface, "wl_shell") == 0)
--        d->shell = wl_display_bind(display, id, &wl_shell_interface);
-+        d->shell = wl_registry_bind(registry, id, &wl_shell_interface, 1);
- }
- 
--static int
--event_mask_update(uint32_t mask, void *data)
--{
--    struct display * const d = data;
--
--    d->event_mask = mask;
--    return 0;
--}
-+static const struct wl_registry_listener registry_listener = {
-+    registry_handle_global,
-+    NULL,
-+};
- 
- static VADisplay
- va_open_display_wayland(void)
-@@ -91,9 +88,10 @@ va_open_display_wayland(void)
-             return NULL;
-         }
-         wl_display_set_user_data(d->display, d);
--        wl_display_add_global_listener(d->display, display_handle_global, d);
--        d->event_fd = wl_display_get_fd(d->display, event_mask_update, d);
--        wl_display_iterate(d->display, d->event_mask);
-+        d->registry = wl_display_get_registry(d->display);
-+        wl_registry_add_listener(d->registry, &registry_listener, d);
-+        d->event_fd = wl_display_get_fd(d->display);
-+        wl_display_dispatch(d->display);
- 
-         d->ref_count = 1;
-         g_display = d;
-@@ -182,6 +180,7 @@ va_put_surface_wayland(
-          dst_rect->x, dst_rect->y, dst_rect->width, dst_rect->height
-      );
- 
-+    wl_surface_commit(d->surface);
-     wl_display_flush(d->display);
-     return VA_STATUS_SUCCESS;
- }
-diff --git a/test/putsurface/putsurface_wayland.c b/test/putsurface/putsurface_wayland.c
-index 3e1d495..b93334d 100644
---- a/test/putsurface/putsurface_wayland.c
-+++ b/test/putsurface/putsurface_wayland.c
-@@ -102,7 +102,7 @@ struct display {
-     struct wl_display  *display;
-     struct wl_compositor *compositor;
-     struct wl_shell    *shell;
--    uint32_t            mask;
-+    struct wl_registry *registry;
-     int                 event_fd;
- };
- 
-@@ -153,7 +153,7 @@ va_put_surface(
-     if (wl_drawable->redraw_pending) {
-         wl_display_flush(d->display);
-         while (wl_drawable->redraw_pending)
--            wl_display_iterate(wl_drawable->display, WL_DISPLAY_READABLE);
-+            wl_display_dispatch(wl_drawable->display);
-     }
- 
-     va_status = vaGetSurfaceBufferWl(va_dpy, va_surface, VA_FRAME_PICTURE, &buffer);
-@@ -169,35 +169,33 @@ va_put_surface(
-     wl_display_flush(d->display);
-     wl_drawable->redraw_pending = 1;
-     callback = wl_surface_frame(wl_drawable->surface);
-+    wl_surface_commit(wl_drawable->surface);
-     wl_callback_add_listener(callback, &frame_callback_listener, wl_drawable);
-     return VA_STATUS_SUCCESS;
- }
- 
- static void
--display_handle_global(
--    struct wl_display *display,
--    uint32_t           id,
--    const char        *interface,
--    uint32_t           version,
--    void              *data
-+registry_handle_global(
-+    void               *data,
-+    struct wl_registry *registry,
-+    uint32_t            id,
-+    const char         *interface,
-+    uint32_t            version
- )
- {
-     struct display * const d = data;
- 
-     if (strcmp(interface, "wl_compositor") == 0)
--        d->compositor = wl_display_bind(display, id, &wl_compositor_interface);
-+        d->compositor =
-+            wl_registry_bind(registry, id, &wl_compositor_interface, 1);
-     else if (strcmp(interface, "wl_shell") == 0)
--        d->shell = wl_display_bind(display, id, &wl_shell_interface);
-+        d->shell = wl_registry_bind(registry, id, &wl_shell_interface, 1);
- }
- 
--static int
--event_mask_update(uint32_t mask, void *data)
--{
--    struct display * const d = data;
--
--    d->mask = mask;
--    return 0;
--}
-+static const struct wl_registry_listener registry_listener = {
-+    registry_handle_global,
-+    NULL,
-+};
- 
- static void *
- open_display(void)
-@@ -213,9 +211,10 @@ open_display(void)
-         return NULL;
- 
-     wl_display_set_user_data(d->display, d);
--    wl_display_add_global_listener(d->display, display_handle_global, d);
--    d->event_fd = wl_display_get_fd(d->display, event_mask_update, d);
--    wl_display_iterate(d->display, d->mask);
-+    d->registry = wl_display_get_registry(d->display);
-+    wl_registry_add_listener(d->registry, &registry_listener, d);
-+    d->event_fd = wl_display_get_fd(d->display);
-+    wl_display_dispatch(d->display);
-     return d->display;
- }
- 
-@@ -298,9 +297,6 @@ check_window_event(
-     if (check_event == 0)
-         return 0;
- 
--    if (!(d->mask & WL_DISPLAY_READABLE))
--        return 0;
--
-     tv.tv_sec  = 0;
-     tv.tv_usec = 0;
-     do {
-@@ -313,7 +309,7 @@ check_window_event(
-             break;
-         }
-         if (retval == 1)
--            wl_display_iterate(d->display, WL_DISPLAY_READABLE);
-+            wl_display_dispatch(d->display);
-     } while (retval > 0);
- 
- #if 0
-diff --git a/va/wayland/va_wayland_drm.c b/va/wayland/va_wayland_drm.c
-index 30c3953..d292316 100644
---- a/va/wayland/va_wayland_drm.c
-+++ b/va/wayland/va_wayland_drm.c
-@@ -44,6 +44,7 @@ typedef struct va_wayland_drm_context {
-     struct va_wayland_context   base;
-     void                       *handle;
-     struct wl_drm              *drm;
-+    struct wl_registry         *registry;
-     void                       *drm_interface;
-     unsigned int                is_authenticated        : 1;
- } VADisplayContextWaylandDRM;
-@@ -142,6 +143,28 @@ va_wayland_drm_destroy(VADisplayContextP pDisplayContext)
-     }
- }
- 
-+static void
-+registry_handle_global(
-+    void               *data,
-+    struct wl_registry *registry,
-+    uint32_t            id,
-+    const char         *interface,
-+    uint32_t            version
-+)
-+{
-+    struct va_wayland_drm_context *wl_drm_ctx = data;
-+
-+    if (strcmp(interface, "wl_drm") == 0) {
-+        wl_drm_ctx->drm =
-+            wl_registry_bind(wl_drm_ctx->registry, id, wl_drm_ctx->drm_interface, 1);
-+    }
-+}
-+
-+static const struct wl_registry_listener registry_listener = {
-+    registry_handle_global,
-+    NULL,
-+};
-+
- bool
- va_wayland_drm_create(VADisplayContextP pDisplayContext)
- {
-@@ -168,14 +191,6 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext)
-     drm_state->auth_type = 0;
-     ctx->drm_state       = drm_state;
- 
--    id = wl_display_get_global(ctx->native_dpy, "wl_drm", 1);
--    if (!id) {
--        wl_display_roundtrip(ctx->native_dpy);
--        id = wl_display_get_global(ctx->native_dpy, "wl_drm", 1);
--        if (!id)
--            return false;
--    }
--
-     wl_drm_ctx->handle = dlopen(LIBWAYLAND_DRM_NAME, RTLD_LAZY|RTLD_LOCAL);
-     if (!wl_drm_ctx->handle)
-         return false;
-@@ -185,8 +200,14 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext)
-     if (!wl_drm_ctx->drm_interface)
-         return false;
- 
--    wl_drm_ctx->drm =
--        wl_display_bind(ctx->native_dpy, id, wl_drm_ctx->drm_interface);
-+    wl_drm_ctx->registry = wl_display_get_registry(ctx->native_dpy);
-+    wl_registry_add_listener(wl_drm_ctx->registry, &registry_listener, wl_drm_ctx);
-+    wl_display_roundtrip(ctx->native_dpy);
-+
-+    /* registry_handle_global should have been called by the
-+     * wl_display_roundtrip above
-+     */
-+
-     if (!wl_drm_ctx->drm)
-         return false;
- 
-diff --git a/va/wayland/va_wayland_emgd.c b/va/wayland/va_wayland_emgd.c
-index 73e6802..cb885d1 100644
---- a/va/wayland/va_wayland_emgd.c
-+++ b/va/wayland/va_wayland_emgd.c
-@@ -40,6 +40,7 @@ typedef struct va_wayland_emgd_context {
-     struct wl_emgd             *emgd;
-     void                       *emgd_interface;
-     unsigned int                is_created      : 1;
-+    struct wl_registry         *registry;
- } VADisplayContextWaylandEMGD;
- 
- static inline void
-@@ -86,6 +87,28 @@ va_wayland_emgd_destroy(VADisplayContextP pDisplayContext)
-     }
- }
- 
-+static void
-+registry_handle_global(
-+    void               *data,
-+    struct wl_registry *registry,
-+    uint32_t            id,
-+    const char         *interface,
-+    uint32_t            version
-+)
-+{
-+    VADisplayContextWaylandEMGD *wl_emgd_ctx = data;
-+
-+    if (strcmp(interface, "wl_emgd") == 0) {
-+        wl_emgd_ctx->emgd =
-+            wl_registry_bind(registry, id, wl_emgd_ctx->emgd_interface, 1);
-+    }
-+}
-+
-+static const struct wl_registry_listener registry_listener = {
-+    registry_handle_global,
-+    NULL,
-+};
-+
- bool
- va_wayland_emgd_create(VADisplayContextP pDisplayContext)
- {
-@@ -112,14 +135,6 @@ va_wayland_emgd_create(VADisplayContextP pDisplayContext)
-     drm_state->auth_type = 0;
-     ctx->drm_state       = drm_state;
- 
--    id = wl_display_get_global(ctx->native_dpy, "wl_emgd", 1);
--    if (!id) {
--        wl_display_roundtrip(ctx->native_dpy);
--        id = wl_display_get_global(ctx->native_dpy, "wl_emgd", 1);
--        if (!id)
--            return false;
--    }
--
-     wl_emgd_ctx->handle = dlopen(LIBWAYLAND_EMGD_NAME, RTLD_LAZY|RTLD_LOCAL);
-     if (!wl_emgd_ctx->handle)
-         return false;
-@@ -129,8 +144,13 @@ va_wayland_emgd_create(VADisplayContextP pDisplayContext)
-     if (!wl_emgd_ctx->emgd_interface)
-         return false;
- 
--    wl_emgd_ctx->emgd =
--        wl_display_bind(ctx->native_dpy, id, wl_emgd_ctx->emgd_interface);
-+    wl_emgd_ctx->registry = wl_display_get_registry(ctx->native_dpy);
-+    wl_registry_add_listener(wl_emgd_ctx->registry, &registry_listener, wl_emgd_ctx);
-+    wl_display_roundtrip(ctx->native_dpy);
-+
-+    /* registry_handle_global should have been called by the
-+     * wl_display_roundtrip above
-+     */
-     if (!wl_emgd_ctx->emgd)
-         return false;
-     return true;
diff --git a/x11-libs/libva/libva-1.0.15.ebuild b/x11-libs/libva/libva-1.0.15.ebuild
deleted file mode 100644
index c3a9530c1d72..000000000000
--- a/x11-libs/libva/libva-1.0.15.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.0.15.ebuild,v 1.7 2013/06/27 13:59:58 aballier Exp $
-
-EAPI="3"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-inherit autotools ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://cgit.freedesktop.org/vaapi/libva/snapshot/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="opengl vdpau"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4
-	video_cards_dummy? ( virtual/udev )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	opengl? ( virtual/opengl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver )
-	vdpau? ( x11-libs/libva-vdpau-driver )
-	video_cards_fglrx? ( x11-libs/xvba-video )
-	video_cards_intel? ( x11-libs/libva-intel-driver )
-	"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" \
-		$(use_enable video_cards_dummy dummy-driver) \
-		$(use_enable video_cards_dummy dummy-backend) \
-		$(use_enable opengl glx)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libva/libva-1.0.16.ebuild b/x11-libs/libva/libva-1.0.16.ebuild
deleted file mode 100644
index 8381e4cd38f4..000000000000
--- a/x11-libs/libva/libva-1.0.16.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.0.16.ebuild,v 1.4 2013/06/27 13:59:58 aballier Exp $
-
-EAPI="3"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-inherit autotools ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://cgit.freedesktop.org/vaapi/libva/snapshot/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="opengl vdpau"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4
-	video_cards_dummy? ( virtual/udev )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	opengl? ( virtual/opengl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver )
-	vdpau? ( x11-libs/libva-vdpau-driver )
-	video_cards_fglrx? ( x11-libs/xvba-video )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
-	"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" \
-		$(use_enable video_cards_dummy dummy-driver) \
-		$(use_enable video_cards_dummy dummy-backend) \
-		$(use_enable opengl glx)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libva/libva-1.1.0.ebuild b/x11-libs/libva/libva-1.1.0.ebuild
deleted file mode 100644
index f46f1ecd25aa..000000000000
--- a/x11-libs/libva/libva-1.1.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.1.0.ebuild,v 1.8 2013/06/27 13:59:58 aballier Exp $
-
-EAPI=4
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-inherit autotools ${SCM} multilib eutils
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://cgit.freedesktop.org/vaapi/libva/snapshot/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="egl opengl vdpau wayland X"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-	)
-	egl? ( media-libs/mesa[egl] )
-	opengl? ( virtual/opengl )
-	wayland? ( >=dev-libs/wayland-0.95.0 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver )
-	vdpau? ( x11-libs/libva-vdpau-driver )
-	video_cards_fglrx? ( x11-libs/xvba-video )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-src_prepare() {
-	has_version '>=dev-libs/wayland-1' && epatch "${FILESDIR}/${P}-wayland1.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" \
-		$(use_enable video_cards_dummy dummy-driver) \
-		$(use_enable opengl glx) \
-		$(use_enable X x11) \
-		$(use_enable wayland) \
-		$(use_enable egl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libva/libva-1.1.1-r1.ebuild b/x11-libs/libva/libva-1.1.1-r1.ebuild
deleted file mode 100644
index 6005bc63ba44..000000000000
--- a/x11-libs/libva/libva-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.1.1-r1.ebuild,v 1.2 2014/06/18 21:02:06 mgorny Exp $
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? ( >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-DOCS=( NEWS )
-
-MULTILIB_WRAPPED_HEADERS=(
-/usr/include/va/va_backend_glx.h
-/usr/include/va/va_x11.h
-/usr/include/va/va_dri2.h
-/usr/include/va/va_dricommon.h
-/usr/include/va/va_glx.h
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libva/libva-1.1.1.ebuild b/x11-libs/libva/libva-1.1.1.ebuild
deleted file mode 100644
index 53569828df84..000000000000
--- a/x11-libs/libva/libva-1.1.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.1.1.ebuild,v 1.3 2013/06/27 13:59:58 aballier Exp $
-
-EAPI=4
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-inherit autotools ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-	)
-	egl? ( media-libs/mesa[egl] )
-	opengl? ( virtual/opengl )
-	wayland? ( >=dev-libs/wayland-1 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver )
-	vdpau? ( x11-libs/libva-vdpau-driver )
-	video_cards_fglrx? ( x11-libs/xvba-video )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" \
-		$(use_enable video_cards_dummy dummy-driver) \
-		$(use_enable opengl glx) \
-		$(use_enable X x11) \
-		$(use_enable wayland) \
-		$(use_enable egl) \
-		$(use_enable drm)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libva/libva-1.2.0-r1.ebuild b/x11-libs/libva/libva-1.2.0-r1.ebuild
deleted file mode 100644
index 4dca548e79bb..000000000000
--- a/x11-libs/libva/libva-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.2.0-r1.ebuild,v 1.2 2014/06/18 21:02:06 mgorny Exp $
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? ( >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-PATCHES=( "${FILESDIR}/${P}-autotools-out-of-source-build.patch" )
-DOCS=( NEWS )
-
-MULTILIB_WRAPPED_HEADERS=(
-/usr/include/va/va_backend_glx.h
-/usr/include/va/va_x11.h
-/usr/include/va/va_dri2.h
-/usr/include/va/va_dricommon.h
-/usr/include/va/va_glx.h
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install
-	# collision with media-video/mjpegtools
-	mv "${ED}"/usr/bin/{mpeg2enc,mpeg2enc_libva} || die
-}
diff --git a/x11-libs/libva/libva-1.2.0.ebuild b/x11-libs/libva/libva-1.2.0.ebuild
deleted file mode 100644
index d882c4fba7f6..000000000000
--- a/x11-libs/libva/libva-1.2.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.2.0.ebuild,v 1.2 2013/06/27 13:59:58 aballier Exp $
-
-EAPI=4
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-inherit autotools ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-	)
-	egl? ( media-libs/mesa[egl] )
-	opengl? ( virtual/opengl )
-	wayland? ( >=dev-libs/wayland-1 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver )
-	vdpau? ( x11-libs/libva-vdpau-driver )
-	video_cards_fglrx? ( x11-libs/xvba-video )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" \
-		$(use_enable video_cards_dummy dummy-driver) \
-		$(use_enable opengl glx) \
-		$(use_enable X x11) \
-		$(use_enable wayland) \
-		$(use_enable egl) \
-		$(use_enable drm)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS || die
-	find "${D}" -name '*.la' -delete
-	# collision with media-video/mjpegtools
-	mv "${ED}"/usr/bin/{mpeg2enc,mpeg2enc_libva} || die
-}
diff --git a/x11-libs/libva/libva-1.2.1-r1.ebuild b/x11-libs/libva/libva-1.2.1-r1.ebuild
deleted file mode 100644
index 7bf8e4dde933..000000000000
--- a/x11-libs/libva/libva-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.2.1-r1.ebuild,v 1.3 2014/06/18 21:02:06 mgorny Exp $
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? ( >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.0-autotools-out-of-source-build.patch" )
-DOCS=( NEWS )
-
-MULTILIB_WRAPPED_HEADERS=(
-/usr/include/va/va_backend_glx.h
-/usr/include/va/va_x11.h
-/usr/include/va/va_dri2.h
-/usr/include/va/va_dricommon.h
-/usr/include/va/va_glx.h
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libva/libva-1.2.1.ebuild b/x11-libs/libva/libva-1.2.1.ebuild
deleted file mode 100644
index 3b97003ead1b..000000000000
--- a/x11-libs/libva/libva-1.2.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.2.1.ebuild,v 1.1 2013/06/29 03:43:38 aballier Exp $
-
-EAPI=4
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-inherit autotools ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-	)
-	egl? ( media-libs/mesa[egl] )
-	opengl? ( virtual/opengl )
-	wayland? ( >=dev-libs/wayland-1 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver )
-	vdpau? ( x11-libs/libva-vdpau-driver )
-	video_cards_fglrx? ( x11-libs/xvba-video )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" \
-		$(use_enable video_cards_dummy dummy-driver) \
-		$(use_enable opengl glx) \
-		$(use_enable X x11) \
-		$(use_enable wayland) \
-		$(use_enable egl) \
-		$(use_enable drm)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libva/libva-1.3.0.ebuild b/x11-libs/libva/libva-1.3.0.ebuild
deleted file mode 100644
index e32e76f17747..000000000000
--- a/x11-libs/libva/libva-1.3.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.3.0.ebuild,v 1.2 2014/06/18 21:02:06 mgorny Exp $
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? ( >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.0-autotools-out-of-source-build.patch" )
-DOCS=( NEWS )
-
-MULTILIB_WRAPPED_HEADERS=(
-/usr/include/va/va_backend_glx.h
-/usr/include/va/va_x11.h
-/usr/include/va/va_dri2.h
-/usr/include/va/va_dricommon.h
-/usr/include/va/va_glx.h
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}